X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=firestarter.spec;h=ba406c24aafde07499977f8d6e33bf8a234bb738;hb=HEAD;hp=92383a4f3416bdfb9885ed045a6a75ce3e95dd59;hpb=e017c9bc00727350701e6e5b1f3d46d94faf41e2;p=packages%2Ffirestarter.git

diff --git a/firestarter.spec b/firestarter.spec
index 92383a4..ba406c2 100644
--- a/firestarter.spec
+++ b/firestarter.spec
@@ -1,11 +1,11 @@
 Summary:	A GNOME firewall tool
-Summary(pl):	Narzêdzie do konfiguracji firewalla dzia³aj±ce w ¶rodowisku GNOME
+Summary(pl.UTF-8):	Narzędzie do konfiguracji firewalla działające w środowisku GNOME
 Name:		firestarter
 Version:	1.0.3
-Release:	2
+Release:	7
 License:	GPL
 Group:		X11/Applications/Networking
-Source0:	http://dl.sourceforge.net/firestarter/%{name}-%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/firestarter/%{name}-%{version}.tar.gz
 # Source0-md5:	f46860a9e16dac4b693bd05f16370b03
 Source1:	%{name}.init
 Patch0:		%{name}-desktop.patch
@@ -14,16 +14,21 @@ Patch2:		%{name}-script.patch
 URL:		http://www.fs-security.com/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-tools
+BuildRequires:	gnome-common
 BuildRequires:	gtk+2-devel >= 1:2.0.0
 BuildRequires:	intltool
 BuildRequires:	libgnome-devel >= 2.0.0
 BuildRequires:	libgnomeui-devel >= 2.0.0
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 Requires(post,preun):	/sbin/chkconfig
 Requires:	iptables
+Requires:	rc-scripts
+# sr@Latn vs. sr@latin
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -32,12 +37,12 @@ GNOME. Use it to quickly set up a secure environment using the
 firewall creation wizard, or use it's monitoring and administrating
 features with your old firewall scripts.
 
-%description -l pl
-FireStarter jest ³atwym w u¿yciu, lecz potê¿nym narzêdziem do
-konfiguracji firewalla dzia³aj±cym w ¶rodowisku GNOME. Mo¿esz go u¿yæ,
-by szybko stworzyæ bezpieczne ¶rodowisko korzystaj±c z kreatora
-tworzenia firewalla, lub skorzystaæ z jego mo¿liwo¶ci monitorowania i
-administrowania wraz z istniej±cymi regu³ami firewalla.
+%description -l pl.UTF-8
+FireStarter jest łatwym w użyciu, lecz potężnym narzędziem do
+konfiguracji firewalla działającym w środowisku GNOME. Możesz go użyć,
+by szybko stworzyć bezpieczne środowisko korzystając z kreatora
+tworzenia firewalla, lub skorzystać z jego możliwości monitorowania i
+administrowania wraz z istniejącymi regułami firewalla.
 
 %prep
 %setup -q
@@ -48,6 +53,7 @@ administrowania wraz z istniej
 mv -f po/{no,nb}.po
 
 %build
+%{__intltoolize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -66,7 +72,7 @@ install -d $RPM_BUILD_ROOT%{_sbindir}
 	Applicationsdir=%{_desktopdir}
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/firestarter
-install firestarter.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/firestarter
+cp -a firestarter.pam $RPM_BUILD_ROOT/etc/pam.d/firestarter
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/firestarter/inbound
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/firestarter/outbound
@@ -90,17 +96,22 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/firestarter/outbound/deny-service
 touch $RPM_BUILD_ROOT%{_sysconfdir}/firestarter/outbound/deny-to
 touch $RPM_BUILD_ROOT%{_sysconfdir}/firestarter/outbound/setup
 
-mv $RPM_BUILD_ROOT%{_bindir}/firestarter $RPM_BUILD_ROOT%{_sbindir}
+mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/firestarter
 
-echo -e "#!/bin/sh
+# TODO: use .desktop magic for this
+cat <<'EOF' > $RPM_BUILD_ROOT%{_bindir}/firestarter
+#!/bin/sh
 if [ -x %{_bindir}/gksudo ] ; then
-	gksudo -g %{_sbindir}/firestarter
+	exec gksudo -g %{_sbindir}/firestarter
 elif [ -x %{_bindir}/kdesu ] ; then
-	kdesu %{_sbindir}/firestarter
+	exec kdesu %{_sbindir}/firestarter
 else
-	%{_sbindir}/firestarter
-fi" > $RPM_BUILD_ROOT%{_bindir}/firestarter
+	exec %{_sbindir}/firestarter
+fi
+EOF
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
+	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
 %find_lang %{name} --with-gnome
 
 %clean
@@ -110,18 +121,12 @@ rm -rf $RPM_BUILD_ROOT
 %gconf_schema_install firestarter.schemas
 %update_desktop_database_post
 /sbin/chkconfig --add firestarter
-if [ -f /var/lock/subsys/firestarter ]; then
-	/etc/rc.d/init.d/firestarter restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/firestarter start\" to start firestarter."
-fi
+%service firestarter restart
 
 %preun
-if [ $1 = 0 ]; then
-    %gconf_schema_uninstall firestarter.schemas
-	if [ -f /var/lock/subsys/firestarter ]; then
-		/etc/rc.d/init.d/firestarter stop 1>&2
-	fi
+if [ "$1" = 0 ]; then
+	%gconf_schema_uninstall firestarter.schemas
+	%service firestarter stop
 	/sbin/chkconfig --del firestarter
 fi
 
@@ -133,11 +138,12 @@ fi
 %doc README ChangeLog AUTHORS TODO CREDITS
 %attr(755,root,root) %{_bindir}/firestarter
 %attr(755,root,root) %{_sbindir}/firestarter
-%attr(754,root,root) /etc/rc.d/init.d/*
+%attr(754,root,root) /etc/rc.d/init.d/firestarter
 %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/firestarter
+%{_sysconfdir}/gconf/schemas/firestarter.schemas
 %{_desktopdir}/firestarter.desktop
+%{_pixmapsdir}/firestarter.png
 %{_datadir}/%{name}
-%{_pixmapsdir}/*
 %dir %attr(700,root,root) %{_sysconfdir}/%{name}
 %dir %attr(700,root,root) %{_sysconfdir}/%{name}/inbound
 %dir %attr(700,root,root) %{_sysconfdir}/%{name}/outbound
@@ -150,4 +156,3 @@ fi
 %config(noreplace) %attr(440,root,root) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/non-routables
 %config(noreplace) %attr(440,root,root) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/sysctl-tuning
 %config(noreplace) %attr(440,root,root) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/user-*
-%{_sysconfdir}/gconf/schemas/*