packages: ucarp/ucarp.spec - adapter - we use tabs for indenting - /etc/{rc...

[glen]

Author: glen                         Date: Wed Mar 31 06:53:01 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adapter
- we use tabs for indenting
- /etc/{rc.d/init.d,sysconfig} may not be macroized with sysconfdir
- files is a mess, so add blocker as the intention is not clear to fix

---- Files affected:
packages/ucarp:
   ucarp.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: packages/ucarp/ucarp.spec
diff -u packages/ucarp/ucarp.spec:1.13 packages/ucarp/ucarp.spec:1.14
--- packages/ucarp/ucarp.spec:1.13	Wed Mar 31 00:06:44 2010
+++ packages/ucarp/ucarp.spec	Wed Mar 31 08:52:56 2010
@@ -14,8 +14,9 @@
 URL:		http://www.ucarp.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	fix:%files
+BuildRequires:	libpcap-devel
 BuildRequires:	libtool
-BuildRequires:  libpcap-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -42,7 +43,7 @@
 sieciowego między nadmiarowymi hostami.
 
 %prep
-%setup -q 
+%setup -q
 
 %build
 %{__libtoolize}
@@ -59,12 +60,12 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/{%{name},rc.d/init.d,sysconfig} $RPM_BUILD_ROOT/%{_varrun}/%{name}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
-install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.template
-install examples/linux/vip-down.sh $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
-install examples/linux/vip-up.sh $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name},/etc/{rc.d/init.d,sysconfig} $RPM_BUILD_ROOT%{_varrun}/%{name}
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.template
+install -p examples/linux/vip-down.sh $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+install -p examples/linux/vip-up.sh $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,22 +76,22 @@
 
 %preun
 if [ "$1" = "0" ]; then
-        %service ucarp stop
-        /sbin/chkconfig --del ucarp
+	%service ucarp stop
+	/sbin/chkconfig --del ucarp
 fi
 
-
 %files
 %defattr(644,root,root,755)
-%{_sysconfdir}/sysconfig/%{name}
-%{_varrun}/%{name}
-%attr(755,root,root) %{_sysconfdir}/rc.d/init.d/%{name}
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
+%attr(754,root,root) /etc/rc.d/init.d/%{name}
 %attr(755,root,root) %{_sbindir}/*
+# XXX fix duplicate packaging
 %dir %{_sysconfdir}/%{name}
 %attr(750,root,root) %{_sysconfdir}/%{name}
 %attr(640,root,root) %{_sysconfdir}/%{name}/*
 %attr(750,root,root) %{_sysconfdir}/%{name}/vip-down.sh
 %attr(750,root,root) %{_sysconfdir}/%{name}/vip-up.sh
+%{_varrun}/%{name}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -98,6 +99,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2010/03/31 06:52:56  glen
+- adapter
+- we use tabs for indenting
+- /etc/{rc.d/init.d,sysconfig} may not be macroized with sysconfdir
+- files is a mess, so add blocker as the intention is not clear to fix
+
 Revision 1.13  2010/03/30 22:06:44  matik
 - upped to 1.5.1
 - created initscript and configuration based on OpenVPN
@@ -139,6 +146,6 @@
 - pl, longer desc from URL
 
 Revision 1.1  2004/10/12 00:13:42  adasi
- - initial PLD release
- - not tested
- - needs cosmetics
+- initial PLD release
+- not tested
+- needs cosmetics
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ucarp/ucarp.spec?r1=1.13&r2=1.14&f=u