Hello community, here is the log from the commit of package crimson for openSUSE:Factory checked in at 2014-08-01 19:26:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crimson (Old) and /work/SRC/openSUSE:Factory/.crimson.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crimson" Changes: -------- --- /work/SRC/openSUSE:Factory/crimson/crimson.changes 2013-09-11 13:39:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.crimson.new/crimson.changes 2014-08-01 19:26:49.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 25 09:22:03 UTC 2014 - tchvatal@suse.com + +- Cleanup with spec-cleaner and update alternatives + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crimson.spec ++++++ --- /var/tmp/diff_new_pack.Cy6fuM/_old 2014-08-01 19:26:50.000000000 +0200 +++ /var/tmp/diff_new_pack.Cy6fuM/_new 2014-08-01 19:26:50.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package crimson # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,6 @@ # -%define section free - Name: crimson Version: 1.1.3 Release: 0 @@ -29,17 +27,17 @@ Patch0: %{name}-noapis.patch Patch1: %{name}-javac6-build.patch Patch2: %{name}-javac-target-15.patch -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: jaxp_parser_impl BuildRequires: ant BuildRequires: java-devel BuildRequires: javapackages-tools BuildRequires: xml-commons-apis -Requires: xml-commons-apis -Requires(post): /usr/sbin/update-alternatives -Requires(preun): /usr/sbin/update-alternatives Requires: javapackages-tools +Requires: xml-commons-apis +Requires(post): update-alternatives +Requires(preun): update-alternatives +Provides: jaxp_parser_impl +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description Crimson is a Java XML parser which supports XML 1.0 via the @@ -54,13 +52,9 @@ javax.xml.transform can be found at Xalan Java 2. - SAX 2.0 - - SAX2 Extensions version 1.0 - - DOM Level 2 Core Recommendation - - %package manual Summary: Java XML parser Group: Development/Libraries/Java @@ -78,13 +72,9 @@ javax.xml.transform can be found at Xalan Java 2. - SAX 2.0 - - SAX2 Extensions version 1.0 - - DOM Level 2 Core Recommendation - - %package javadoc Summary: Java XML parser Group: Development/Libraries/Java @@ -102,13 +92,9 @@ javax.xml.transform can be found at Xalan Java 2. - SAX 2.0 - - SAX2 Extensions version 1.0 - - DOM Level 2 Core Recommendation - - %package demo Summary: Java XML parser Group: Development/Libraries/Java @@ -127,16 +113,12 @@ javax.xml.transform can be found at Xalan Java 2. - SAX 2.0 - - SAX2 Extensions version 1.0 - - DOM Level 2 Core Recommendation - - %prep %setup -q -%patch0 -p0 +%patch0 %patch1 -b .sav1 %patch2 -b .sav2 @@ -146,30 +128,25 @@ %install # jars -%{__mkdir} -p ${RPM_BUILD_ROOT}%{_javadir} -%{__cp} -p build/%{name}.jar \ - ${RPM_BUILD_ROOT}%{_javadir}/%{name}-%{version}.jar +mkdir -p %{buildroot}%{_javadir} +cp -p build/%{name}.jar \ + %{buildroot}%{_javadir}/%{name}-%{version}.jar ( - cd $RPM_BUILD_ROOT%{_javadir} + cd %{buildroot}%{_javadir} for jar in *-%{version}*; do - %{__ln_s} -f ${jar} `echo $jar | sed "s|-%{version}||g"` + ln -s -f ${jar} `echo $jar | sed "s|-%{version}||g"` done ) # javadoc -%{__mkdir} -p ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-%{version} -%{__cp} -pr build/docs/api/* \ - ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-%{version} -%{__ln_s} %{name}-%{version} \ - ${RPM_BUILD_ROOT}%{_javadocdir}/%{name} +mkdir -p %{buildroot}%{_javadocdir}/%{name} +cp -pr build/docs/api/* \ + %{buildroot}%{_javadocdir}/%{name} # demo -%{__mkdir} -p ${RPM_BUILD_ROOT}%{_datadir}/%{name} -%{__cp} -pr examples ${RPM_BUILD_ROOT}%{_datadir}/%{name} -# jaxp_parser_impl ghost symlink -%{__ln_s} %{_sysconfdir}/alternatives \ - ${RPM_BUILD_ROOT}%{_javadir}/jaxp_parser_impl.jar - -%clean -%{__rm} -rf $RPM_BUILD_ROOT +mkdir -p %{buildroot}%{_datadir}/%{name} +cp -pr examples %{buildroot}%{_datadir}/%{name} +# alternatives code +mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ +ln -sf %{_sysconfdir}/alternatives/jaxp_parser_impl.jar %{buildroot}%{_javadir}/jaxp_parser_impl.jar %post update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \ @@ -184,7 +161,8 @@ %defattr(0644,root,root,0755) %doc ChangeLog README.txt %{_javadir}/%{name}*.jar -%ghost %{_javadir}/jaxp_parser_impl.jar +%{_javadir}/jaxp_parser_impl.jar +%ghost %{_sysconfdir}/alternatives/jaxp_parser_impl.jar %files manual %defattr(0644,root,root,0755) @@ -192,7 +170,6 @@ %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %files demo -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org