Hello community, here is the log from the commit of package xerces-j2 for openSUSE:Factory checked in at 2014-08-01 19:26:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xerces-j2 (Old) and /work/SRC/openSUSE:Factory/.xerces-j2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xerces-j2" Changes: -------- --- /work/SRC/openSUSE:Factory/xerces-j2/xerces-j2.changes 2014-06-30 22:50:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xerces-j2.new/xerces-j2.changes 2014-08-01 19:26:53.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Jul 21 09:58:48 UTC 2014 - tchvatal@suse.com + +- Fixup man page permissions + +------------------------------------------------------------------- +Mon Jul 21 09:20:42 UTC 2014 - tchvatal@suse.com + +- Sort out update-alternatives + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xerces-j2.spec ++++++ --- /var/tmp/diff_new_pack.sQPsyX/_old 2014-08-01 19:26:54.000000000 +0200 +++ /var/tmp/diff_new_pack.sQPsyX/_new 2014-08-01 19:26:54.000000000 +0200 @@ -17,8 +17,6 @@ %define cvs_version 2_11_0 -%define release 3jpp -%define section free Name: xerces-j2 Version: 2.11.0 Release: 0 @@ -186,8 +184,8 @@ (cd %{buildroot}%{_javadir} && for jar in *-%{version}*.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # scripts mkdir -p %{buildroot}%{_bindir} -cp -p %{SOURCE2} %{buildroot}%{_bindir}/%{name}-version -cp -p %{SOURCE4} %{buildroot}%{_bindir}/%{name}-constants +install -p -m 755 %{SOURCE2} %{buildroot}%{_bindir}/%{name}-version +install -p -m 755 %{SOURCE4} %{buildroot}%{_bindir}/%{name}-constants # mans install -d -m 755 %{buildroot}%{_mandir}/man1 install -p -m 644 %{SOURCE3} %{buildroot}%{_mandir}/man1 @@ -197,15 +195,12 @@ cp -p build/xercesSamples.jar \ %{buildroot}%{_datadir}/%{name}/%{name}-samples.jar cp -pr data %{buildroot}%{_datadir}/%{name} -# jaxp_parser_impl ghost symlink -ln -s %{_sysconfdir}/alternatives \ - %{buildroot}%{_javadir}/jaxp_parser_impl.jar -# xml-apis ghost symlink -ln -s %{_sysconfdir}/alternatives \ - %{buildroot}%{_javadir}/xml-commons-apis.jar -# xml-resolver ghost symlink -ln -s %{_sysconfdir}/alternatives \ - %{buildroot}%{_javadir}/xml-commons-resolver.jar + +# alternatives +mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ +ln -sf %{_sysconfdir}/alternatives/jaxp_parser_impl.jar %{buildroot}%{_javadir}/jaxp_parser_impl.jar +ln -sf %{_sysconfdir}/alternatives/xml-commons-apis.jar %{buildroot}%{_javadir}/xml-commons-apis.jar +ln -sf %{_sysconfdir}/alternatives/xml-commons-resolver.jar %{buildroot}%{_javadir}/xml-commons-resolver.jar %post %{_sbindir}/update-alternatives --install %{_javadir}/jaxp_parser_impl.jar jaxp_parser_impl %{_javadir}/%{name}.jar 23 @@ -220,48 +215,48 @@ %{_sbindir}/update-alternatives --auto xml-commons-resolver %preun -{ - [ $1 = 0 ] || exit 0 +if [ $1 = 0 ] ; then %{_sbindir}/update-alternatives --remove jaxp_parser_impl %{_javadir}/%{name}.jar -} >/dev/null 2>&1 || : +fi %preun xml-apis -{ - [ $1 = 0 ] || exit 0 +if [ $1 = 0 ] ; then %{_sbindir}/update-alternatives --remove xml-commons-apis %{_javadir}/%{name}-xml-apis.jar -} >/dev/null 2>&1 || : +fi %preun xml-resolver -{ - [ $1 = 0 ] || exit 0 +if [ $1 = 0 ] ; then %{_sbindir}/update-alternatives --remove xml-commons-resolver %{_javadir}/%{name}-xml-commons-resolver.jar -} >/dev/null 2>&1 || : +fi %files %defattr(0644,root,root,0755) %doc LICENSE README %{_javadir}/%{name}-%{version}.jar %{_javadir}/%{name}.jar -%ghost %{_javadir}/jaxp_parser_impl.jar +%{_javadir}/jaxp_parser_impl.jar +%ghost %{_sysconfdir}/alternatives/jaxp_parser_impl.jar %files xml-apis %defattr(0644,root,root,0755) %{_javadir}/%{name}-%{version}-xml-apis.jar %{_javadir}/%{name}-xml-apis.jar -%ghost %{_javadir}/xml-commons-apis.jar +%{_javadir}/xml-commons-apis.jar +%ghost %{_sysconfdir}/alternatives/xml-commons-apis.jar %files xml-resolver %defattr(0644,root,root,0755) %{_javadir}/%{name}-%{version}-xml-resolver.jar %{_javadir}/%{name}-xml-resolver.jar -%ghost %{_javadir}/xml-commons-resolver.jar +%{_javadir}/xml-commons-resolver.jar +%ghost %{_sysconfdir}/alternatives/xml-commons-resolver.jar %files demo %defattr(0644,root,root,0755) %{_datadir}/%{name} %files scripts -%defattr(0755,root,root,0755) +%defattr(-,root,root) %{_bindir}/* %{_mandir}/man1/* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org