Hello community,
here is the log from the commit of package jakarta-commons-digester for
openSUSE:Factory checked in at 2014-07-16 16:49:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jakarta-commons-digester (Old)
and /work/SRC/openSUSE:Factory/.jakarta-commons-digester.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-commons-digester"
Changes:
--------
---
/work/SRC/openSUSE:Factory/jakarta-commons-digester/jakarta-commons-digester.changes
2011-09-23 02:03:56.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-digester.new/jakarta-commons-digester.changes
2014-07-16 16:49:56.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Jul 8 10:25:21 UTC 2014 - [email protected]
+
+- Cleanup with spec cleaner and fix build again.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jakarta-commons-digester.spec ++++++
--- /var/tmp/diff_new_pack.YJkXUU/_old 2014-07-16 16:49:57.000000000 +0200
+++ /var/tmp/diff_new_pack.YJkXUU/_new 2014-07-16 16:49:57.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package jakarta-commons-digester (Version 1.7)
+# spec file for package jakarta-commons-digester
#
-# Copyright (c) 2009 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
@@ -15,43 +15,36 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-# icecream 0
-
-Name: jakarta-commons-digester
-BuildRequires: ant jakarta-commons-beanutils java2-devel-packages
xml-commons-apis
%define base_name digester
%define short_name commons-%{base_name}
-%define name jakarta-%{short_name}
-%define version 1.7
-%define release 1jpp
-%define section free
+Name: jakarta-commons-digester
Version: 1.7
-Release: 313
+Release: 0
Summary: Jakarta Commons Digester Package
License: Apache-2.0
Group: Development/Libraries/Java
-Source0:
http://www.apache.org/dist/jakarta/commons/digester/source/commons-digester-%{version}-src.tar.gz
-Patch: %{name}-java14compat.patch
Url: http://jakarta.apache.org/commons/digester/
+Source0:
http://www.apache.org/dist/jakarta/commons/digester/source/commons-digester-%{version}-src.tar.gz
+Patch0: %{name}-java14compat.patch
+BuildRequires: ant
+BuildRequires: apache-commons-collections
+BuildRequires: jakarta-commons-beanutils
+BuildRequires: java-devel
+BuildRequires: xml-commons-apis
Requires: jakarta-commons-beanutils >= 1.7
Requires: jakarta-commons-logging >= 1.0
-BuildArch: noarch
+Provides: %{short_name} = %{version}
+Obsoletes: %{short_name} < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Provides: %{short_name}
-Obsoletes: %{short_name}
+BuildArch: noarch
%description
The goal of the Jakarta Commons Digester project is to create and
maintain an XML to Java object mapping package written in the Java
language to be distributed under the ASF license.
-
-
%package javadoc
-License: Apache-2.0
-PreReq: coreutils
Summary: Javadoc for jakarta-commons-digester
Group: Development/Libraries/Java
@@ -63,15 +56,13 @@
This package contains the javadoc documentation for the Jakarta Commons
Digester Package.
-
-
%prep
%setup -q -n %{short_name}-%{version}-src
-%patch
+%patch0
%build
cp LICENSE.txt ../LICENSE
-export CLASSPATH=%(build-classpath commons-logging commons-beanutils junit)
+export CLASSPATH=%(build-classpath commons-collections commons-logging
commons-beanutils junit)
ant dist
# Build rss -- needed by struts
export CLASSPATH=$CLASSPATH:`pwd`/dist/%{short_name}.jar
@@ -80,26 +71,14 @@
%install
# jars
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-cp -p src/examples/rss/dist/%{short_name}-rss.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}-rss.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar}
`echo $jar| sed "s|jakarta-||g"`; done)
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar}
`echo $jar| sed "s|-%{version}||g"`; done)
+mkdir -p %{buildroot}%{_javadir}
+cp -p dist/%{short_name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+cp -p src/examples/rss/dist/%{short_name}-rss.jar
%{buildroot}%{_javadir}/%{name}-%{version}-rss.jar
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar}
`echo $jar| sed "s|jakarta-||g"`; done)
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar}
`echo $jar| sed "s|-%{version}||g"`; done)
# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
- rm -f %{_javadocdir}/%{name}
-fi
+mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
+cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
%files
%defattr(0644,root,root,0755)
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
