Hello community,
here is the log from the commit of package jakarta-commons-vfs for
openSUSE:Factory checked in at 2013-09-09 13:11:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jakarta-commons-vfs (Old)
and /work/SRC/openSUSE:Factory/.jakarta-commons-vfs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-commons-vfs"
Changes:
--------
--- /work/SRC/openSUSE:Factory/jakarta-commons-vfs/jakarta-commons-vfs.changes
2011-09-23 02:03:58.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-vfs.new/jakarta-commons-vfs.changes
2013-09-09 13:11:30.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Sep 6 09:14:29 UTC 2013 - [email protected]
+
+- use add_maven_depmap
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jakarta-commons-vfs.spec ++++++
--- /var/tmp/diff_new_pack.0eURxM/_old 2013-09-09 13:11:31.000000000 +0200
+++ /var/tmp/diff_new_pack.0eURxM/_new 2013-09-09 13:11:31.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package jakarta-commons-vfs (Version 1.0)
+# spec file for package jakarta-commons-vfs
#
-# 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
@@ -27,11 +27,11 @@
Name: jakarta-commons-vfs
Version: 1.0
-Release: 2
+Release: 0
Summary: Commons Virtual Filesystem
License: Apache-2.0
-Url: http://jakarta.apache.org/commons/vfs/
Group: Development/Libraries/Java
+Url: http://jakarta.apache.org/commons/vfs/
# svn export
http://svn.apache.org/repos/asf/jakarta/commons/proper/vfs/tags/vfs-1.0/
Source0: commons-vfs-1.0-src.tar.bz2
Source1: pom-maven2jpp-depcat.xsl
@@ -49,6 +49,7 @@
Source13: sandbox-maven-build.xml
Patch0: commons-vfs-1.0-project_properties.patch
Patch1: commons-vfs-1.0-jakarta-commons-httpclient-3.1.patch
+Requires: jaf_1_1_api
Requires: jakarta-commons-codec
Requires: jakarta-commons-collections
Requires: jakarta-commons-compress
@@ -56,7 +57,6 @@
Requires: jakarta-commons-logging
Requires: jakarta-commons-net
Requires: jakarta-slide-webdavclient
-Requires: jaf_1_1_api
Requires: javamail_1_4_api
Requires: jcifs
Requires: jdom
@@ -75,6 +75,7 @@
BuildRequires: ant >= 1.6
BuildRequires: ant-junit
%endif
+BuildRequires: jaf_1_1_api
BuildRequires: jakarta-commons-codec
BuildRequires: jakarta-commons-collections
BuildRequires: jakarta-commons-compress
@@ -82,7 +83,6 @@
BuildRequires: jakarta-commons-logging
BuildRequires: jakarta-commons-net
BuildRequires: jakarta-slide-webdavclient
-BuildRequires: jaf_1_1_api
BuildRequires: javamail_1_4_api
BuildRequires: jcifs
BuildRequires: jdom
@@ -119,7 +119,6 @@
%package javadoc
-License: Apache-2.0
Summary: Commons Virtual Filesystem
Group: Development/Libraries/Java
@@ -150,7 +149,6 @@
%package manual
-License: Apache-2.0
Summary: Commons Virtual Filesystem
Group: Development/Libraries/Java
@@ -243,20 +241,23 @@
%install
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 target/%{base_name}-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -m 644 target/%{base_name}-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in jakarta-*; do \
ln -sf ${jar} ${jar/jakarta-/}; done)
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do \
-ln -sf ${jar} ${jar/-%{version}/}; done)
-%add_to_maven_depmap commons-vfs commons-vfs %{version} JPP commons-vfs
+
+#pom
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -m 0644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap
+
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%if %with maven
cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
# FIXME: (dwalluck): breaks --short-circuit
rm -rf target/docs/apidocs
%else
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
rm -rf target/site/apidocs
%endif
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -267,19 +268,11 @@
find $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -name "*.sav" -exec rm {} \;
%endif
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
%defattr(0644,root,root,0755)
%doc *.txt
%{_javadir}/*
+%{_mavenpomdir}/*
%config %{_mavendepmapfragdir}/*
%files manual
@@ -288,7 +281,6 @@
%files javadoc
%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
