packages: shorewall-shell/shorewall-shell.spec - use %%{_datadir} instead o...

[lisu]

Author: lisu                         Date: Mon Jul 20 13:21:25 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use %%{_datadir} instead of %{_usr}/share
- chkconfig unused in spec (it's required by install.sh script)
- TODO: try to switch install.sh to by-hand installation

---- Files affected:
packages/shorewall-shell:
   shorewall-shell.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/shorewall-shell/shorewall-shell.spec
diff -u packages/shorewall-shell/shorewall-shell.spec:1.1 packages/shorewall-shell/shorewall-shell.spec:1.2
--- packages/shorewall-shell/shorewall-shell.spec:1.1	Mon Jul 20 14:53:02 2009
+++ packages/shorewall-shell/shorewall-shell.spec	Mon Jul 20 15:21:20 2009
@@ -8,7 +8,7 @@
 Group:		Networking/Utilities
 Source0:	http://shorewall.net/pub/shorewall/4.2/shorewall-%{version}/%{name}-%{version}.tgz
 URL:		http://www.shorewall.net/
-Requires(post,preun):	/sbin/chkconfig
+Requires	/sbin/chkconfig
 Requires:	bash
 Requires:	iproute2
 Requires:	iptables
@@ -41,6 +41,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
+# TODO: try to avoid foreign scripts (intsall by hand)
 export PREFIX=$RPM_BUILD_ROOT ; \
 export OWNER=`id -n -u` ; \
 export GROUP=`id -n -g` ;\
@@ -51,9 +52,9 @@
 
 %files
 %defattr(644,root,root,755)
-%dir %{_usr}/share/%{name}
-%attr(755,root,root) %{_usr}/share/%{name}/compiler
-%{_usr}/share/%{name}/*
+%dir %{_datadir}/%{name}
+%attr(755,root,root) %{_datadir}/%{name}/compiler
+%{_datadir}/%{name}/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -61,6 +62,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2009/07/20 13:21:20  lisu
+- use %%{_datadir} instead of %{_usr}/share
+- chkconfig unused in spec (it's required by install.sh script)
+- TODO: try to switch install.sh to by-hand installation
+
 Revision 1.1  2009/07/20 12:53:02  matik
 - initial
 - rel 0.1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/shorewall-shell/shorewall-shell.spec?r1=1.1&r2=1.2&f=u