packages: hudson/hudson.spec - you shall not package a directory with %conf...

[glen]

Author: glen                         Date: Thu Mar 25 19:31:26 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- you shall not package a directory with %config
- be consistent: use always name macro

---- Files affected:
packages/hudson:
   hudson.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: packages/hudson/hudson.spec
diff -u packages/hudson/hudson.spec:1.27 packages/hudson/hudson.spec:1.28
--- packages/hudson/hudson.spec:1.27	Wed Mar 24 14:19:18 2010
+++ packages/hudson/hudson.spec	Thu Mar 25 20:31:20 2010
@@ -18,10 +18,10 @@
 URL:		https://hudson.dev.java.net/
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
-BuildRequires:  rpmbuild(macros) >= 1.546
-Requires:	tomcat
+BuildRequires:	rpmbuild(macros) >= 1.546
 Requires:	jpackage-utils
 Requires:	jre-X11
+Requires:	tomcat
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -45,18 +45,17 @@
 
 %prep
 %setup -qc
-
 rm *.class
 rm winstone.jar
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/hudson,%{_datadir}/hudson,%{_sharedstatedir}/hudson,%{_tomcatconfdir}}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/web.xml
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tomcat-context.xml
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_datadir}/%{name},%{_sharedstatedir}/%{name},%{_tomcatconfdir}}
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/web.xml
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tomcat-context.xml
 ln -sf %{_sysconfdir}/%{name}/tomcat-context.xml $RPM_BUILD_ROOT%{_tomcatconfdir}/%{name}.xml
-cp -a . $RPM_BUILD_ROOT%{_datadir}/hudson
-ln -sf %{_sysconfdir}/hudson/web.xml $RPM_BUILD_ROOT%{_datadir}/hudson/WEB-INF/web.xml
+cp -a . $RPM_BUILD_ROOT%{_datadir}/%{name}
+ln -sf %{_sysconfdir}/%{name}/web.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/web.xml
 
 %postun
 %tomcat_clear_cache %{name}
@@ -66,10 +65,11 @@
 
 %files
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.xml
 %{_tomcatconfdir}/%{name}.xml
 %{_datadir}/%{name}
-%attr(2775,root,servlet) %dir %{_sharedstatedir}/hudson
+%attr(2775,root,servlet) %dir %{_sharedstatedir}/%{name}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -77,6 +77,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2010/03/25 19:31:20  glen
+- you shall not package a directory with %config
+- be consistent: use always name macro
+
 Revision 1.27  2010/03/24 13:19:18  pawelz
 - partially reverted previous commit
 - rel 2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hudson/hudson.spec?r1=1.27&r2=1.28&f=u