Hello community,

here is the log from the commit of package saxon9 for openSUSE:Factory checked 
in at 2013-09-11 13:37:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/saxon9 (Old)
 and      /work/SRC/openSUSE:Factory/.saxon9.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "saxon9"

Changes:
--------
--- /work/SRC/openSUSE:Factory/saxon9/saxon9.changes    2013-07-16 
17:02:45.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.saxon9.new/saxon9.changes       2013-09-11 
13:37:54.000000000 +0200
@@ -1,0 +2,10 @@
+Wed Sep 11 07:37:14 UTC 2013 - [email protected]
+
+- use add_maven_depmap from javapackages-tools
+
+-------------------------------------------------------------------
+Mon Sep  9 11:06:21 UTC 2013 - [email protected]
+
+- Move from jpackage-utils to javapackage-tools
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ saxon9.spec ++++++
--- /var/tmp/diff_new_pack.g4uKGE/_old  2013-09-11 13:37:55.000000000 +0200
+++ /var/tmp/diff_new_pack.g4uKGE/_new  2013-09-11 13:37:55.000000000 +0200
@@ -103,8 +103,8 @@
 Summary:        Utility scripts for %{name}
 Group:          Productivity/Publishing/XML
 Requires:       %{name} = %{version}-%{release}
+Requires:       javapackages-tools
 Requires:       jaxp_parser_impl
-Requires:       jpackage-utils >= 1.6
 Requires:       xml-commons-apis
 
 %description    scripts
@@ -145,39 +145,34 @@
 %install
 
 # jars
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p build/lib/saxon.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+mkdir -p %{buildroot}%{_javadir}
+cp -p build/lib/saxon.jar %{buildroot}%{_javadir}/%{name}.jar
 
 # javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr build/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -pr build/api/* %{buildroot}%{_javadocdir}/%{name}
 
 # demo
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -pr samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}
+mkdir -p %{buildroot}%{_datadir}/%{name}
+cp -pr samples/* %{buildroot}%{_datadir}/%{name}
 
 # scripts
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}
-install -p -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}q
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
-install -p -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1/%{name}q.1
+mkdir -p %{buildroot}%{_bindir}
+install -p -m755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
+install -p -m755 %{SOURCE2} %{buildroot}%{_bindir}/%{name}q
+mkdir -p %{buildroot}%{_mandir}/man1
+install -p -m644 %{SOURCE4} %{buildroot}%{_mandir}/man1/%{name}.1
+install -p -m644 %{SOURCE5} %{buildroot}%{_mandir}/man1/%{name}q.1
 
 # jaxp_transform_impl ghost symlink
 ln -s %{_sysconfdir}/alternatives \
-  $RPM_BUILD_ROOT%{_javadir}/jaxp_transform_impl.jar
+  %{buildroot}%{_javadir}/jaxp_transform_impl.jar
 
 # a simple POM
-install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-sed -i -e 's/saxon-he/saxon/' $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-#FIXME: some strange python exception even with javapackages-tools 0.3.1
-# % add_maven_depmap JPP-%{name}.pom %{name}.jar
-%add_to_maven_depmap JPP-%{name}.pom %{name}.jar
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -dm 755 %{buildroot}%{_mavenpomdir}
+install -m 644 %{SOURCE7} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+sed -i -e 's/saxon-he/saxon/' %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap
 
 %post
 update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
@@ -189,11 +184,6 @@
   update-alternatives --remove jaxp_transform_impl %{_javadir}/%{name}.jar
 } >/dev/null 2>&1 || :
 
-%pre javadoc
-# workaround for rpm bug
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
 %files
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}.jar




-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to