Hello community,
here is the log from the commit of package jakarta-commons-discovery for
openSUSE:Factory checked in at 2012-06-13 13:23:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jakarta-commons-discovery (Old)
and /work/SRC/openSUSE:Factory/.jakarta-commons-discovery.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-commons-discovery", Maintainer is
"bnc-team-j...@forge.provo.novell.com"
Changes:
--------
---
/work/SRC/openSUSE:Factory/jakarta-commons-discovery/jakarta-commons-discovery.changes
2011-09-23 02:03:56.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-discovery.new/jakarta-commons-discovery.changes
2012-06-13 13:23:20.000000000 +0200
@@ -1,0 +2,8 @@
+Fri May 25 10:52:30 UTC 2012 - mvysko...@suse.cz
+
+- fix a build with jdk7
+- reformat spec a bit, remove obsoleted gcj parts and don't version javadoc dir
+- build with commons-logging work as well
+- provide commons-discovery
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jakarta-commons-discovery.spec ++++++
--- /var/tmp/diff_new_pack.MzoLL2/_old 2012-06-13 13:23:21.000000000 +0200
+++ /var/tmp/diff_new_pack.MzoLL2/_new 2012-06-13 13:23:21.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package jakarta-commons-discovery (Version 0.4)
+# spec file for package jakarta-commons-discovery
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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,38 +15,27 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-# icecream 0
-%define gcj_support
%{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
%define short_name commons-discovery
-%define section free
-Summary: Jakarta Commons Discovery
Name: jakarta-commons-discovery
Version: 0.4
-Release: 106
-Group: Development/Libraries/Java
+Release: 0
+Summary: Jakarta Commons Discovery
License: Apache-2.0
+Group: Development/Libraries/Java
Url: http://jakarta.apache.org/commons/discovery.html
-%if ! %{gcj_support}
-BuildArch: noarch
-%endif
Source0:
http://www.apache.org/dist/jakarta/commons/discovery/source/commons-discovery-0.4-src.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: jpackage-utils >= 1.6
+BuildArch: noarch
+
BuildRequires: ant
-BuildRequires: junit >= 3.7
-BuildRequires: jakarta-commons-logging >= 1.0.4
-Requires: jakarta-commons-logging >= 1.0.4
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-%if %defined suse_version
+BuildRequires: commons-logging >= 1.0.4
BuildRequires: java-devel
-%endif
+BuildRequires: jpackage-utils >= 1.6
+BuildRequires: junit >= 3.7
+Requires: commons-logging >= 1.0.4
+Provides: %{short_name} = %{version}-%{release}
%description
The Discovery component is about discovering, or finding,
@@ -59,12 +48,9 @@
%package javadoc
-License: Apache-2.0
PreReq: coreutils
-Group: Development/Libraries/Java
Summary: Javadoc for jakarta-commons-discovery
-Requires(post): /bin/rm /bin/ln
-Requires(postun): /bin/rm
+Group: Development/Libraries/Java
%description javadoc
The Discovery component is about discovering, or finding,
@@ -87,54 +73,23 @@
%build
ant \
-Djunit.jar=%(find-jar junit) \
- -Dlogger.jar=%(find-jar jakarta-commons-logging) \
- -Dant.build.javac.target=1.4 \
- -Dant.build.javac.source=1.4 \
+ -Dlogger.jar=%(find-jar commons-logging) \
test.discovery dist
# -----------------------------------------------------------------------------
%install
+
# jar
mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && ln -s %{name}-%{version}.jar
%{short_name}-%{version}.jar && for jar in *-%{version}.jar; do ln -sf ${jar}
`echo $jar| sed "s|-%{version}||g"`; done)
+cp -p dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{short_name}.jar
+(cd $RPM_BUILD_ROOT%{_javadir} && ln -s %{short_name}.jar %{name}.jar)
+
# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
-# -----------------------------------------------------------------------------
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%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
-%if %{gcj_support}
-
-%post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-%if %{gcj_support}
-
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
%files
%defattr(0644,root,root,0755)
@@ -143,8 +98,6 @@
%files javadoc
%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
-# -----------------------------------------------------------------------------
+%doc %{_javadocdir}/%{name}
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
