Dnia piątek, 17 grudnia 2004 13:43, Charles napisał:
> Update do wersji 1.0.1.

Kurcze, niechcąco posłałem całego speca :(
Diff w załączniku

-- 
  Pozdrawiam
  Karol "Charles" Krenski
Index: firestarter.spec
===================================================================
RCS file: /cvsroot/SPECS/firestarter.spec,v
retrieving revision 1.32
diff -u -r1.32 firestarter.spec
--- firestarter.spec	27 Nov 2004 18:52:06 -0000	1.32
+++ firestarter.spec	17 Dec 2004 12:20:44 -0000
@@ -2,26 +2,25 @@
 Summary:	A GNOME firewall tool
 Summary(pl):	Narzędzie do konfiguracji firewalla działające w środowisku GNOME
 Name:		firestarter
-Version:	0.9.3
-Release:	1	
+Version:	1.0.1
+Release:	0.1
 License:	GPL
 Group:		X11/Applications/Networking
 Source0:	http://dl.sourceforge.net/firestarter/%{name}-%{version}.tar.gz
-# Source0-md5:	dd2475e0e1e09cfe676d1728011f0e22
+# Source0-md5:	ef5afad42201639f282dec4eda20720d
 Patch0:		%{name}-acfix.patch
-Patch1:		%{name}-desktop.patch
-Patch2:		%{name}-locale_names.patch
-Patch3:		%{name}-kdesu.patch
-URL:		http://firestarter.sourceforge.net/
+Patch1:		%{name}-locale_names.patch
+URL:		http://www.fs-security.com/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	gettext-devel
-BuildRequires:	gtk+2-devel >= 1:2.0.0
-BuildRequires:	libgnome-devel >= 2.0.0
+BuildRequires:	gtk+2-devel >= 1:2.4
 BuildRequires:	libgnomeui-devel >= 2.0.0
 BuildRequires:	libtool
 BuildRequires:	sed >= 4.0
 Requires:	iptables
+Requires(post,preun):	/sbin/chkconfig
+Requires(post,preun):	GConf2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -41,8 +40,6 @@
 %setup -q
 %patch0 -p0
 %patch1 -p1
-%patch2 -p1
-%patch3 -p0
 
 mv -f po/{no,nb}.po
 
@@ -53,24 +50,64 @@
 %{__automake}
 %configure
 %{__sed} -i 's/xml::\/etc\//xml::\$PREFIX\/etc\//' Makefile
+
+%{__sed} -i 's,Exec=firestarter,Exec=kdesu firestarter,' firestarter.desktop
+%{__sed} -i 's,System;Application;,GTK;GNOME;System;X-Administration;,' firestarter.desktop
+
+%{__sed} -i -e 's,success,ok,g' -e 's,failure,fail,g' -e 's,echo$,,g' -e 's,echo \-n,show,g' fedora.init
+%{__sed} -i -e 's,\(show.*$\),\1; busy,g' fedora.init
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/firestarter
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/firestarter/inbound
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/firestarter/outbound
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	Applicationsdir=%{_desktopdir}
 
 %find_lang %{name} --with-gnome
 
+install -p -D fedora.init $RPM_BUILD_ROOT%{_initrddir}/firestarter
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null
+if [ "$1" = "1" ]; then
+        /sbin/chkconfig --add firestarter
+        /sbin/chkconfig firestarter on
+fi
+
+%preun
+if [ "$1" = "0" ]; then
+	export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
+	gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null
+	/sbin/service firestarter stop >/dev/null 2>&1
+	/sbin/chkconfig --del firestarter
+fi
+
+%postun
+if [ "$1" = "0" ]; then
+    if [ -e /etc/dhclient-exit-hooks ]; then
+        grep -v 'sh %{_sysconfdir}/firestarter/firewall.sh start' < /etc/dhclient-exit-hooks > /etc/dhclient-exit-hooks.tmp
+        mv /etc/dhclient-exit-hooks.tmp /etc/dhclient-exit-hooks
+    fi
+fi
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README ChangeLog AUTHORS TODO CREDITS
 %attr(755,root,root) %{_bindir}/firestarter
+%attr(754,root,root) %{_initrddir}/firestarter
+%dir %attr(700,root,root) %{_sysconfdir}/firestarter
+%{_datadir}/firestarter/*
 %{_desktopdir}/firestarter.desktop
 %{_pixmapsdir}/*
 %config(noreplace) %{_sysconfdir}/firestarter/*
_______________________________________________
pld-devel-pl mailing list
[EMAIL PROTECTED]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl

Odpowiedź listem elektroniczym