packages: icedtea6/icedtea6.spec - config files to /etc

[jajcus]

Author: jajcus                       Date: Fri Apr 16 07:32:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- config files to /etc

---- Files affected:
packages/icedtea6:
   icedtea6.spec (1.26 -> 1.27) 

---- Diffs:

================================================================
Index: packages/icedtea6/icedtea6.spec
diff -u packages/icedtea6/icedtea6.spec:1.26 packages/icedtea6/icedtea6.spec:1.27
--- packages/icedtea6/icedtea6.spec:1.26	Fri Apr 16 09:28:14 2010
+++ packages/icedtea6/icedtea6.spec	Fri Apr 16 09:32:48 2010
@@ -373,7 +373,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{dstdir},%{_mandir}/ja,%{_browserpluginsdir}} \
-	$RPM_BUILD_ROOT{%{jvmjardir},%{_prefix}/src/%{name}-{jdk-sources,examples}}
+	$RPM_BUILD_ROOT{%{jvmjardir},%{_prefix}/src/%{name}-{jdk-sources,examples}} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
 # install the 'JDK image', it contains the JRE too
 cp -a openjdk/build/linux-*/j2sdk-image/* $RPM_BUILD_ROOT%{dstdir}
@@ -406,7 +407,15 @@
 done
 ln -sf ../jre/lib/jexec $RPM_BUILD_ROOT%{dstdir}/lib/jexec
 
-%if %{with plugin}
+# keep configuration in /etc (not all *.properties go there)
+for config in management security content-types.properties \
+		logging.properties net.properties sound.properties ; do
+
+	mv $RPM_BUILD_ROOT%{dstdir}/lib/$config $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$config
+	ln -s %{_sysconfdir}/%{name}/$config $RPM_BUILD_ROOT%{dstdir}/lib/$config
+done
+
+%if %{with_plugin}
 ln -s %{jredir}/lib/%{jre_arch}/IcedTeaPlugin.so $RPM_BUILD_ROOT%{_browserpluginsdir}
 %endif
 
@@ -616,6 +625,8 @@
 %defattr(644,root,root,755)
 %doc openjdk/build/linux-*/j2sdk-image/THIRD_PARTY_README
 %doc openjdk/build/linux-*/j2sdk-image/ASSEMBLY_EXCEPTION
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*
 %dir %{dstdir}
 %dir %{jredir}
 %{_jvmdir}/%{name}-jre
@@ -779,6 +790,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2010/04/16 07:32:48  jajcus
+- config files to /etc
+
 Revision 1.26  2010/04/16 07:28:14  glen
 - _browserpluginsdir is a macro
 - cosmetics, fixes, do not trust always adapter
================================================================

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