summaryrefslogtreecommitdiffstats
path: root/redhat/applications/kmyfirewall
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/applications/kmyfirewall')
-rw-r--r--redhat/applications/kmyfirewall/kmyfirewall-3.5.13-fix_gcc47_compilation.patch39
-rw-r--r--redhat/applications/kmyfirewall/trinity-kmyfirewall.spec33
2 files changed, 61 insertions, 11 deletions
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-fix_gcc47_compilation.patch
new file mode 100644
index 000000000..4daf67e9b
--- /dev/null
+++ b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-fix_gcc47_compilation.patch
@@ -0,0 +1,39 @@
+--- ./kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp.orig 2012-05-02 04:58:04.051212974 -0400
++++ ./kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp 2012-05-02 05:07:11.093803088 -0400
+@@ -305,14 +305,15 @@
+ if ( m_zone && ! m_host ) {
+ if ( onOff ) {
+ m_protocolUsage = 0;
+- if ( KMFProtocolUsage* pro = m_zone->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
++ KMFProtocolUsage* pro;
++ if ( pro = m_zone->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
+ m_protocolUsage = pro;
+ } else {
+ KMFUndoEngine::instance()->startTransaction(
+ m_zone,
+ i18n("Add protocol %1 to zone %2.").tqarg( protUsage->protocol()->name() ).tqarg( m_zone->guiName() )
+ );
+- KMFProtocolUsage * pro = m_zone->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol()->getDOMTree() );
++ pro = m_zone->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol()->getDOMTree() );
+
+ if ( pro ) {
+ kdDebug() << "Added Protocol to zone: " << m_zone-> name() << endl;
+@@ -341,15 +342,16 @@
+ } else if ( m_host ) {
+ if ( onOff ) {
+ m_protocolUsage = 0;
++ KMFProtocolUsage* pro;
+
+- if ( KMFProtocolUsage* pro = m_host->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
++ if ( pro = m_host->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
+ m_protocolUsage = pro;
+ } else {
+ KMFUndoEngine::instance()->startTransaction(
+ m_host,
+ i18n("Add protocol %1 to host %2.").tqarg( protUsage->protocol()->name() ).tqarg( m_host->guiName() )
+ );
+- KMFProtocolUsage * pro = m_host->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol() ->getDOMTree() );
++ pro = m_host->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol() ->getDOMTree() );
+
+ if ( pro ) {
+ kdDebug() << "Added Protocol to host: " << m_host-> name() << endl;
diff --git a/redhat/applications/kmyfirewall/trinity-kmyfirewall.spec b/redhat/applications/kmyfirewall/trinity-kmyfirewall.spec
index 54befc39d..ddc21d3fa 100644
--- a/redhat/applications/kmyfirewall/trinity-kmyfirewall.spec
+++ b/redhat/applications/kmyfirewall/trinity-kmyfirewall.spec
@@ -1,7 +1,7 @@
# Default version for this component
%define kdecomp kmyfirewall
%define version 1.1.1
-%define release 1
+%define release 2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -33,6 +33,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.tar.gz
+# [kmyfirewall] GCC 4.7 fixes. [Commit #88d2d2a7]
+Patch1: kmyfirewall-3.5.13-fix_gcc47_compilation.patch
BuildRequires: tqtinterface-devel
BuildRequires: trinity-kdelibs-devel
@@ -64,15 +66,16 @@ Requires: %{name} = %{version}-%{release}
%prep
unset QTDIR; . /etc/profile.d/qt.sh
%setup -q -n applications/%{kdecomp}
+%patch1 -p1
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \
- -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
- -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+ -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+ -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -98,13 +101,17 @@ export PATH="%{_bindir}:${PATH}"
%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+for f in hicolor Locolor; do
+ touch --no-create %{_datadir}/icons/${f} || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
/sbin/ldconfig || :
%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+for f in hicolor Locolor; do
+ touch --no-create %{_datadir}/icons/${f} || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
/sbin/ldconfig || :
@@ -158,7 +165,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%{tde_docdir}/HTML/en/kmyfirewall/common
%{tde_docdir}/HTML/en/kmyfirewall/index.cache.bz2
%{tde_docdir}/HTML/en/kmyfirewall/index.docbook
-%{_datadir}/icons/*/*/apps/kmyfirewall.png
+%{_datadir}/icons/hicolor/*/apps/kmyfirewall.png
+%{_datadir}/icons/Locolor/*/apps/kmyfirewall.png
%{_datadir}/mimelnk/application/kmfgrs.desktop
%{_datadir}/mimelnk/application/kmfnet.desktop
%{_datadir}/mimelnk/application/kmfpkg.desktop
@@ -174,6 +182,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%{_libdir}/libkmfwidgets.so
%Changelog
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-2
+- GCC 4.7 fixes. [Commit #88d2d2a7]
+
+* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.1.1-1
- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16