summaryrefslogtreecommitdiffstats
path: root/redhat/applications/kmyfirewall
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2018-11-27 21:34:48 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2018-11-27 21:34:48 +0100
commita615d19df88eb2e989316b480519161945dbc7dc (patch)
tree369970b98042998b86c11024598155e037b76fec /redhat/applications/kmyfirewall
parent76a93e0011ade1583a1ec672f33411dfd35454f3 (diff)
downloadtde-packaging-a615d19df88eb2e989316b480519161945dbc7dc.tar.gz
tde-packaging-a615d19df88eb2e989316b480519161945dbc7dc.zip
RPM: merge redhat directory with master branch
Diffstat (limited to 'redhat/applications/kmyfirewall')
-rw-r--r--redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec233
-rw-r--r--redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec24
-rw-r--r--redhat/applications/kmyfirewall/trinity-kmyfirewall-rpmlintrc2
3 files changed, 132 insertions, 127 deletions
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec b/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
index 2b74b4528..a24777758 100644
--- a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
+++ b/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
@@ -1,52 +1,82 @@
-# Default version for this component
-%define tde_pkg kmyfirewall
+#
+# spec file for package kmyfirewall (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
%endif
-
-# TDE specific building variables
+%define tde_pkg kmyfirewall
+%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-%define _docdir %{tde_docdir}
-
-Name: trinity-%{tde_pkg}
-Summary: iptables based firewall configuration tool for TDE [Trinity]
-Version: 1.1.1
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 1.1.1
+Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary: Iptables based firewall configuration tool for TDE
+Group: Applications/Utilities
+URL: http://www.trinitydesktop.org/
-License: GPLv2+
-Group: Applications/Utilities
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1: %{name}-rpmlintrc
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+BuildRequires: autoconf automake libtool m4
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: libtool
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
%description
KMyFirewall attempts to make it easier to setup iptables based firewalls on
@@ -60,78 +90,6 @@ configure your rule set one time and then you can use it on several computers
giving each of them a similar configuration (p.e. school networks, office,
university etc.)
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-%{summary}
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__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"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- --includedir=%{tde_tdeincludedir} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO
@@ -173,12 +131,12 @@ done
%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.la
%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.so
%{tde_tdeappdir}/kmyfirewall.desktop
-%{tde_datadir}/apps/kmfgenericinterfacepart/kmfgenericinterfacepartui.rc
-%{tde_datadir}/apps/kmfipteditorpart/kmfipteditorpartui.rc
-%{tde_datadir}/apps/kmfsystray
-%{tde_datadir}/apps/kmyfirewall
+%{tde_datadir}/apps/kmfgenericinterfacepart/
+%{tde_datadir}/apps/kmfipteditorpart/
+%{tde_datadir}/apps/kmfsystray/
+%{tde_datadir}/apps/kmyfirewall/
%{tde_datadir}/config.kcfg/kmfconfig.kcfg
-%{tde_datadir}/config/kmyfirewallrc
+%{tde_confdir}/kmyfirewallrc
%{tde_tdedocdir}/HTML/en/kmyfirewall/
%{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png
%{tde_datadir}/icons/locolor/*/apps/kmyfirewall.png
@@ -189,6 +147,16 @@ done
%{tde_datadir}/services/kmf*.desktop
%{tde_datadir}/servicetypes/kmf*.desktop
+##########
+
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+%{summary}
+
%files devel
%{tde_tdeincludedir}/kmyfirewall
%{tde_libdir}/libkmfcore.la
@@ -196,6 +164,61 @@ done
%{tde_libdir}/libkmfwidgets.la
%{tde_libdir}/libkmfwidgets.so
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
+
+%configure \
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
+ --bindir=%{tde_bindir} \
+ --datadir=%{tde_datadir} \
+ --libdir=%{tde_libdir} \
+ --mandir=%{tde_mandir} \
+ --includedir=%{tde_tdeincludedir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --disable-gcc-hidden-visibility
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r "%{tde_pkg}" System Network
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.1.1-6
-- Initial release for TDE 14.0.0
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec
index 2bb53f516..ffea0e925 100644
--- a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec
+++ b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec
@@ -2,11 +2,6 @@
%define tde_pkg kmyfirewall
%define tde_version 3.5.13.2
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
@@ -27,7 +22,7 @@
Name: trinity-%{tde_pkg}
Summary: iptables based firewall configuration tool for TDE [Trinity]
Version: 1.1.1
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
License: GPLv2+
Group: Applications/Utilities
@@ -78,7 +73,7 @@ Requires: %{name} = %{version}-%{release}
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__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"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -196,18 +191,3 @@ done
%{tde_libdir}/libkmfwidgets.so
%changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.1.1-5
-- Build for Fedora 19
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.1.1-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-3
-- Initial release for TDE 3.5.13.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 release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/kmyfirewall/trinity-kmyfirewall-rpmlintrc b/redhat/applications/kmyfirewall/trinity-kmyfirewall-rpmlintrc
new file mode 100644
index 000000000..529351884
--- /dev/null
+++ b/redhat/applications/kmyfirewall/trinity-kmyfirewall-rpmlintrc
@@ -0,0 +1,2 @@
+setBadness('library-without-ldconfig-postun', 0)
+setBadness('library-without-ldconfig-postin', 0)