Hello community,
here is the log from the commit of package jakarta-commons-modeler for
openSUSE:Factory checked in at 2013-09-14 20:30:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jakarta-commons-modeler (Old)
and /work/SRC/openSUSE:Factory/.jakarta-commons-modeler.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-commons-modeler"
Changes:
--------
---
/work/SRC/openSUSE:Factory/jakarta-commons-modeler/jakarta-commons-modeler.changes
2011-09-23 02:03:57.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-modeler.new/jakarta-commons-modeler.changes
2013-09-14 20:31:00.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Sep 13 10:58:02 UTC 2013 - [email protected]
+
+- use unversioned javadocdir
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jakarta-commons-modeler.spec ++++++
--- /var/tmp/diff_new_pack.jG30LD/_old 2013-09-14 20:31:00.000000000 +0200
+++ /var/tmp/diff_new_pack.jG30LD/_new 2013-09-14 20:31:00.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package jakarta-commons-modeler (Version 2.0)
+# spec file for package jakarta-commons-modeler
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -14,13 +14,18 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-# norootforbuild
# icecream 0
Name: jakarta-commons-modeler
-BuildRequires: ant jakarta-commons-digester java2-devel-packages junit mx4j
xalan-j2 xml-commons-apis
+BuildRequires: ant
+BuildRequires: jakarta-commons-digester
+BuildRequires: java2-devel-packages
+BuildRequires: javapackages-tools
+BuildRequires: junit
+BuildRequires: mx4j
+BuildRequires: xalan-j2
+BuildRequires: xml-commons-apis
%define base_name modeler
%define short_name commons-%{base_name}
%define name jakarta-%{short_name}
@@ -28,7 +33,7 @@
%define release 4jpp
%define section free
Version: 2.0
-Release: 282
+Release: 0
Summary: Jakarta Commons Modeler Package
License: Apache-2.0
Group: Development/Libraries/Java
@@ -36,14 +41,14 @@
#Patch: %{name}.no-licence.build.patch
Patch: %{name}-java14compat.patch
Url: http://jakarta.apache.org/commons/modeler/
-Requires: jaxp_parser_impl
-Requires: xml-commons-apis
-Requires: jaxp_transform_impl
-Requires: mx4j
Requires: jakarta-commons-beanutils >= 1.3
Requires: jakarta-commons-collections >= 2.0
Requires: jakarta-commons-digester >= 1.2
Requires: jakarta-commons-logging >= 1.0
+Requires: jaxp_parser_impl
+Requires: jaxp_transform_impl
+Requires: mx4j
+Requires: xml-commons-apis
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: %{short_name}
@@ -58,7 +63,6 @@
%package javadoc
-License: Apache-2.0
PreReq: coreutils
Summary: Javadoc for jakarta-commons-modeler
Group: Development/Libraries/Java
@@ -91,21 +95,8 @@
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %__ln_s ${jar}
`echo $jar| %__sed "s|jakarta-||g"`; done)
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %__ln_s ${jar}
`echo $jar| %__sed "s|-%{version}||g"`; done)
# javadoc
-%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
-%__cp -a dist/docs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-(cd %{buildroot}%{_javadocdir} && %__ln_s %{name}-%{version} %{name})
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post javadoc
-%__rm -f %{_javadocdir}/%{name}
-%__ln_s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ $1 -eq 0 ]; then
- %__rm -f %{_javadocdir}/%{name}
-fi
+%__mkdir_p %{buildroot}%{_javadocdir}/%{name}
+%__cp -a dist/docs/* %{buildroot}%{_javadocdir}/%{name}
%files
%defattr(0644,root,root,0755)
@@ -114,8 +105,6 @@
%files javadoc
%defattr(0644,root,root,0755)
-%dir %{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}-%{version}/*
-%ghost %dir %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}
%changelog
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
