commit jakarta-commons-vfs for openSUSE:Factory
Hello community,
here is the log from the commit of package jakarta-commons-vfs for
openSUSE:Factory checked in at 2019-03-05 12:26:10
Comparing /work/SRC/openSUSE:Factory/jakarta-commons-vfs (Old)
and /work/SRC/openSUSE:Factory/.jakarta-commons-vfs.new.28833 (New)
Package is "jakarta-commons-vfs"
Tue Mar 5 12:26:10 2019 rev:19 rq:681619 version:1.0
Changes:
--- /work/SRC/openSUSE:Factory/jakarta-commons-vfs/jakarta-commons-vfs.changes
2019-01-28 20:49:10.937858496 +0100
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-vfs.new.28833/jakarta-commons-vfs.changes
2019-03-05 12:26:13.968828809 +0100
@@ -1,0 +2,7 @@
+Fri Mar 1 20:27:10 UTC 2019 - Fridrich Strba
+
+- Install all three built jar files
+- Associate the right pom file with the corresponding artifacts
+- Remove unnecessary sources and simplify the ant build
+
+---
Old:
build.xml
commons-build.tar.bz2
commons-vfs-1.0-jpp-depmap.xml
core-build.xml
core-maven-build.xml
examples-build.xml
examples-maven-build.xml
maven-build.xml
pom-maven2jpp-depcat.xsl
pom-maven2jpp-mapdeps.xsl
pom-maven2jpp-newdepmap.xsl
sandbox-build.xml
sandbox-maven-build.xml
New:
commons-vfs-1.0-build.tar.xz
Other differences:
--
++ jakarta-commons-vfs.spec ++
--- /var/tmp/diff_new_pack.oag9SF/_old 2019-03-05 12:26:14.924828981 +0100
+++ /var/tmp/diff_new_pack.oag9SF/_new 2019-03-05 12:26:14.924828981 +0100
@@ -26,19 +26,7 @@
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
-Source2:pom-maven2jpp-newdepmap.xsl
-Source3:pom-maven2jpp-mapdeps.xsl
-Source4:commons-vfs-1.0-jpp-depmap.xml
-Source5:commons-build.tar.bz2
-Source6:build.xml
-Source7:maven-build.xml
-Source8:core-build.xml
-Source9:core-maven-build.xml
-Source10: examples-build.xml
-Source11: examples-maven-build.xml
-Source12: sandbox-build.xml
-Source13: sandbox-maven-build.xml
+Source1:commons-vfs-1.0-build.tar.xz
Patch0: commons-vfs-1.0-project_properties.patch
Patch1: commons-vfs-1.0-jakarta-commons-httpclient-3.1.patch
BuildRequires: ant >= 1.6
@@ -107,18 +95,12 @@
different types.
%prep
-%setup -q -n vfs-%{version}
-%setup -q -T -D -a 5 -n vfs-%{version}
+%setup -q -n vfs-%{version} -a1
%patch0
%patch1 -p1
find . -name "*.jar" | xargs -t rm
-cp -p %{SOURCE6} %{SOURCE7} .
-cp -p %{SOURCE8} core/build.xml
-cp -p %{SOURCE9} core/maven-build.xml
-cp -p %{SOURCE10} examples/build.xml
-cp -p %{SOURCE11} examples/maven-build.xml
-cp -p %{SOURCE12} sandbox/build.xml
-cp -p %{SOURCE13} sandbox/maven-build.xml
+
+%pom_remove_parent core examples sandbox
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
@@ -140,14 +122,20 @@
%install
# jars
install -d -m 755 %{buildroot}%{_javadir}
-install -m 644 target/%{base_name}-%{version}.jar
%{buildroot}%{_javadir}/%{name}.jar
-(cd %{buildroot}%{_javadir} && for jar in jakarta-*; do \
-ln -sf ${jar} ${jar/jakarta-/}; done)
-
+install -m 644 target/%{base_name}-%{version}*.jar
%{buildroot}%{_javadir}/%{base_name}.jar
+ln -sf %{base_name}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -m 644 target/%{base_name}-examples-%{version}*.jar
%{buildroot}%{_javadir}/%{base_name}-examples.jar
+ln -sf %{base_name}-examples.jar %{buildroot}%{_javadir}/%{name}-examples.jar
+install -m 644 target/%{base_name}-sandbox-%{version}*.jar
%{buildroot}%{_javadir}/%{base_name}-sandbox.jar
+ln -sf %{base_name}-sandbox.jar %{buildroot}%{_javadir}/%{name}-sandbox.jar
#pom
mkdir -p %{buildroot}%{_mavenpomdir}
-install -m 0644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
+install -m 0644 core/pom.xml %{buildroot}%{_mavenpomdir}/%{base_name}.pom
+%add_maven_depmap %{base_name}.pom %{base_name}.jar
+install -m 0644 examples/pom.xml
%{buildroot}%{_mavenpomdir}/%{base_name}-examples.pom
+%add_maven_depmap %{base_name}-examples.pom %{base_name}-examples.jar
+install -m 0644 sandbox/pom.xml
%{buildroot}%{_mavenpomdir}/%{base_name}-sandbox.pom
+%add_maven_depmap %{base_name}-sandbox.pom %{base_name}-sandbox.jar
# javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
@@ -157,11 +145,9 @@
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
-%files
+%files -f .mfiles
%doc *.txt
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_datadir}/maven-metadata/%{name}.xml*
+%{_javadir}/%{name}*.jar
%files manual
%{_docdir}/%{name}-%{version}
commit jakarta-commons-vfs for openSUSE:Factory
Hello community,
here is the log from the commit of package jakarta-commons-vfs for
openSUSE:Factory checked in at 2019-01-28 20:48:10
Comparing /work/SRC/openSUSE:Factory/jakarta-commons-vfs (Old)
and /work/SRC/openSUSE:Factory/.jakarta-commons-vfs.new.28833 (New)
Package is "jakarta-commons-vfs"
Mon Jan 28 20:48:10 2019 rev:18 rq:668559 version:1.0
Changes:
--- /work/SRC/openSUSE:Factory/jakarta-commons-vfs/jakarta-commons-vfs.changes
2017-09-20 17:09:19.645964120 +0200
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-vfs.new.28833/jakarta-commons-vfs.changes
2019-01-28 20:49:10.937858496 +0100
@@ -1,0 +2,7 @@
+Fri Jan 25 09:29:09 UTC 2019 - Fridrich Strba
+
+- Remove dependency on jakarta-commons-compress, since nothing
+ in the build needs it
+- Build against javamail and not javamail_1_4_api
+
+---
Other differences:
--
++ jakarta-commons-vfs.spec ++
--- /var/tmp/diff_new_pack.FRRQde/_old 2019-01-28 20:49:12.061857311 +0100
+++ /var/tmp/diff_new_pack.FRRQde/_new 2019-01-28 20:49:12.061857311 +0100
@@ -1,7 +1,7 @@
#
# spec file for package jakarta-commons-vfs
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -23,7 +23,7 @@
Summary:Commons Virtual Filesystem
License:Apache-2.0
Group: Development/Libraries/Java
-Url:http://jakarta.apache.org/commons/vfs/
+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
@@ -47,14 +47,12 @@
BuildRequires: jaf_1_1_api
BuildRequires: jakarta-commons-codec
BuildRequires: jakarta-commons-collections
-BuildRequires: jakarta-commons-compress
BuildRequires: jakarta-commons-httpclient3
BuildRequires: jakarta-commons-logging
BuildRequires: jakarta-commons-net
BuildRequires: jakarta-slide-webdavclient
-BuildRequires: javamail_1_4_api
+BuildRequires: javamail
BuildRequires: javapackages-local
-BuildRequires: javapackages-tools
BuildRequires: jcifs
BuildRequires: jdom
BuildRequires: jsch
@@ -64,12 +62,11 @@
Requires: jaf_1_1_api
Requires: jakarta-commons-codec
Requires: jakarta-commons-collections
-Requires: jakarta-commons-compress
Requires: jakarta-commons-httpclient3
Requires: jakarta-commons-logging
Requires: jakarta-commons-net
Requires: jakarta-slide-webdavclient
-Requires: javamail_1_4_api
+Requires: javamail
Requires: jcifs
Requires: jdom
Requires: jsch
@@ -126,7 +123,7 @@
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
-export CLASSPATH=$(build-classpath commons-collections commons-httpclient3
commons-logging commons-net jaf_1_1_api javamail_1_4_api jcifs jdom jsch junit
slide/jakarta-slide-webdavlib):`pwd`/target/commons-vfs-%{version}.jar:`pwd`/target/test-classes
+export CLASSPATH=$(build-classpath commons-collections commons-httpclient3
commons-logging commons-net jaf_1_1_api javamail/mail jcifs jdom jsch junit
slide/jakarta-slide-webdavlib):`pwd`/target/commons-vfs-%{version}.jar:`pwd`/target/test-classes
export OPT_JAR_LIST="junit ant/ant-junit"
ant \
-Dmaven.build.dir=`pwd`/target \
commit jakarta-commons-vfs for openSUSE:Factory
Hello community,
here is the log from the commit of package jakarta-commons-vfs for
openSUSE:Factory checked in at 2017-09-20 17:09:18
Comparing /work/SRC/openSUSE:Factory/jakarta-commons-vfs (Old)
and /work/SRC/openSUSE:Factory/.jakarta-commons-vfs.new (New)
Package is "jakarta-commons-vfs"
Wed Sep 20 17:09:18 2017 rev:17 rq:527033 version:1.0
Changes:
--- /work/SRC/openSUSE:Factory/jakarta-commons-vfs/jakarta-commons-vfs.changes
2017-05-20 10:14:36.059933671 +0200
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-vfs.new/jakarta-commons-vfs.changes
2017-09-20 17:09:19.645964120 +0200
@@ -1,0 +2,5 @@
+Mon Sep 18 13:28:49 UTC 2017 - fst...@suse.com
+
+- Fix build with jdk9: specify java source and target version 1.6
+
+---
Other differences:
--
++ jakarta-commons-vfs.spec ++
--- /var/tmp/diff_new_pack.OUdMci/_old 2017-09-20 17:09:20.437852645 +0200
+++ /var/tmp/diff_new_pack.OUdMci/_new 2017-09-20 17:09:20.437852645 +0200
@@ -41,22 +41,9 @@
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
-Requires: jakarta-commons-httpclient3
-Requires: jakarta-commons-logging
-Requires: jakarta-commons-net
-Requires: jakarta-slide-webdavclient
-Requires: javamail_1_4_api
-Requires: jcifs
-Requires: jdom
-Requires: jsch
-Requires: oro
-Requires: xml-commons-apis
BuildRequires: ant >= 1.6
BuildRequires: ant-junit
+BuildRequires: fdupes
BuildRequires: jaf_1_1_api
BuildRequires: jakarta-commons-codec
BuildRequires: jakarta-commons-collections
@@ -74,6 +61,20 @@
BuildRequires: junit
BuildRequires: oro
BuildRequires: xml-commons-apis
+Requires: jaf_1_1_api
+Requires: jakarta-commons-codec
+Requires: jakarta-commons-collections
+Requires: jakarta-commons-compress
+Requires: jakarta-commons-httpclient3
+Requires: jakarta-commons-logging
+Requires: jakarta-commons-net
+Requires: jakarta-slide-webdavclient
+Requires: javamail_1_4_api
+Requires: jcifs
+Requires: jdom
+Requires: jsch
+Requires: oro
+Requires: xml-commons-apis
BuildArch: noarch
%description
@@ -111,7 +112,7 @@
%prep
%setup -q -n vfs-%{version}
%setup -q -T -D -a 5 -n vfs-%{version}
-%patch0 -p0
+%patch0
%patch1 -p1
find . -name "*.jar" | xargs -t rm
cp -p %{SOURCE6} %{SOURCE7} .
@@ -141,9 +142,9 @@
%install
# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 target/%{base_name}-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in jakarta-*; do \
+install -d -m 755 %{buildroot}%{_javadir}
+install -m 644 target/%{base_name}-%{version}.jar
%{buildroot}%{_javadir}/%{name}.jar
+(cd %{buildroot}%{_javadir} && for jar in jakarta-*; do \
ln -sf ${jar} ${jar/jakarta-/}; done)
#pom
@@ -152,25 +153,23 @@
%add_maven_depmap
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}
rm -rf target/site/apidocs
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
%files
-%defattr(0644,root,root,0755)
%doc *.txt
%{_javadir}/*
%{_mavenpomdir}/*
%{_datadir}/maven-metadata/%{name}.xml*
%files manual
-%defattr(0644,root,root,0755)
%{_docdir}/%{name}-%{version}
%files javadoc
-%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}
%changelog
++ core-maven-build.xml ++
--- /var/tmp/diff_new_pack.OUdMci/_old 2017-09-20 17:09:20.513841948 +0200
+++ /var/tmp/diff_new_pack.OUdMci/_new 2017-09-20 17:09:20.513841948 +0200
@@ -92,10 +92,10 @@
debug="true"
optimize="false"
deprecation="true"
- target="1.3"
+ target="1.6"
verbose="false"
fork="false"
- source="1.3">
+ source="1.6">
@@ -133,10 +133,10 @@
debug="true"
optimize="false"
deprecation="true"
- target="1.3"
+ target="1.6"
verbose="false"
commit jakarta-commons-vfs for openSUSE:Factory
Hello community,
here is the log from the commit of package jakarta-commons-vfs for
openSUSE:Factory checked in at 2017-05-20 10:14:34
Comparing /work/SRC/openSUSE:Factory/jakarta-commons-vfs (Old)
and /work/SRC/openSUSE:Factory/.jakarta-commons-vfs.new (New)
Package is "jakarta-commons-vfs"
Sat May 20 10:14:34 2017 rev:16 rq:496780 version:1.0
Changes:
--- /work/SRC/openSUSE:Factory/jakarta-commons-vfs/jakarta-commons-vfs.changes
2015-04-02 15:56:31.0 +0200
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-vfs.new/jakarta-commons-vfs.changes
2017-05-20 10:14:36.059933671 +0200
@@ -1,0 +2,6 @@
+Fri May 19 14:00:40 UTC 2017 - tchva...@suse.com
+
+- Fix build with new javapackages-tools
+- Cleanup unused conditionals
+
+---
Other differences:
--
++ jakarta-commons-vfs.spec ++
--- /var/tmp/diff_new_pack.dGrmyK/_old 2017-05-20 10:14:36.903814440 +0200
+++ /var/tmp/diff_new_pack.dGrmyK/_new 2017-05-20 10:14:36.903814440 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jakarta-commons-vfs
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,15 +16,7 @@
#
-%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-%define bcond_with()%{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
-%define _without_maven 1
-%bcond_with maven
-%define section free
%define base_name commons-vfs
-
Name: jakarta-commons-vfs
Version:1.0
Release:0
@@ -63,18 +55,8 @@
Requires: jsch
Requires: oro
Requires: xml-commons-apis
-Requires(post): javapackages-tools
-Requires(postun): javapackages-tools
-BuildRequires: javapackages-tools
-BuildRequires: junit
-%if %with maven
-BuildRequires: maven >= 1.1
-BuildRequires: saxon
-BuildRequires: saxon-scripts
-%else
BuildRequires: ant >= 1.6
BuildRequires: ant-junit
-%endif
BuildRequires: jaf_1_1_api
BuildRequires: jakarta-commons-codec
BuildRequires: jakarta-commons-collections
@@ -84,13 +66,15 @@
BuildRequires: jakarta-commons-net
BuildRequires: jakarta-slide-webdavclient
BuildRequires: javamail_1_4_api
+BuildRequires: javapackages-local
+BuildRequires: javapackages-tools
BuildRequires: jcifs
BuildRequires: jdom
BuildRequires: jsch
+BuildRequires: junit
BuildRequires: oro
BuildRequires: xml-commons-apis
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Commons VFS provides a single API for accessing various different
@@ -100,24 +84,6 @@
Commons VFS are: * A single consistent API for accessing files of
different types.
-* Support for numerous file system types.
-
-* Caching of file information. Caches information in-JVM, and
- optionally can cache remote file information on the local file
- system.
-
-* Event delivery.
-
-* Support for logical file systems made up of files from various
- different file systems.
-
-* Utilities for integrating Commons VFS into applications, such as a
- VFS-aware ClassLoader and URLStreamHandlerFactory.
-
-* A set of VFS-enabled Ant tasks.
-
-
-
%package javadoc
Summary:Commons Virtual Filesystem
Group: Development/Libraries/Java
@@ -130,24 +96,6 @@
Commons VFS are: * A single consistent API for accessing files of
different types.
-* Support for numerous file system types.
-
-* Caching of file information. Caches information in-JVM, and
- optionally can cache remote file information on the local file
- system.
-
-* Event delivery.
-
-* Support for logical file systems made up of files from various
- different file systems.
-
-* Utilities for integrating Commons VFS into applications, such as a
- VFS-aware ClassLoader and URLStreamHandlerFactory.
-
-* A set of VFS-enabled Ant tasks.
-
-
-
%package manual
Summary:Commons Virtual Filesystem
Group: Development/Libraries/Java
@@ -160,31 +108,12 @@
Commons VFS are: * A single consistent API for accessing files of
different types.
-* Support for numerous file system types.
-
-* Caching of file information. Caches information in-JVM, and
- optionally can cache remote file information on the local file
- system.
-
-* Event delivery.
-
-* Support for logical file systems made up of files from various
- different file systems.
-
-* Utilities for integrating Commons VFS into
commit jakarta-commons-vfs for openSUSE:Factory
Hello community,
here is the log from the commit of package jakarta-commons-vfs for
openSUSE:Factory checked in at 2015-04-02 15:56:30
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
2013-09-11 13:38:52.0 +0200
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-vfs.new/jakarta-commons-vfs.changes
2015-04-02 15:56:31.0 +0200
@@ -1,0 +2,5 @@
+Wed Mar 18 09:46:10 UTC 2015 - tchva...@suse.com
+
+- Fix build with new javapackages-tools
+
+---
Other differences:
--
++ jakarta-commons-vfs.spec ++
--- /var/tmp/diff_new_pack.YGYVtx/_old 2015-04-02 15:56:32.0 +0200
+++ /var/tmp/diff_new_pack.YGYVtx/_new 2015-04-02 15:56:32.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jakarta-commons-vfs
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -273,7 +273,7 @@
%doc *.txt
%{_javadir}/*
%{_mavenpomdir}/*
-%config %{_mavendepmapfragdir}/*
+%{_datadir}/maven-metadata/%{name}.xml*
%files manual
%defattr(0644,root,root,0755)
commit jakarta-commons-vfs for openSUSE:Factory
Hello community, here is the log from the commit of package jakarta-commons-vfs for openSUSE:Factory checked in at 2013-09-11 13:38:51 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 2013-09-09 13:11:30.0 +0200 +++ /work/SRC/openSUSE:Factory/.jakarta-commons-vfs.new/jakarta-commons-vfs.changes 2013-09-11 13:38:52.0 +0200 @@ -1,0 +2,5 @@ +Mon Sep 9 11:05:49 UTC 2013 - tchva...@suse.com + +- Move from jpackage-utils to javapackage-tools + +--- Other differences: -- ++ jakarta-commons-vfs.spec ++ --- /var/tmp/diff_new_pack.fxjBR2/_old 2013-09-11 13:38:52.0 +0200 +++ /var/tmp/diff_new_pack.fxjBR2/_new 2013-09-11 13:38:52.0 +0200 @@ -63,9 +63,9 @@ Requires: jsch Requires: oro Requires: xml-commons-apis -Requires(post): jpackage-utils = 1.7.2 -Requires(postun): jpackage-utils = 1.7.2 -BuildRequires: jpackage-utils = 1.7.2 +Requires(post): javapackages-tools +Requires(postun): javapackages-tools +BuildRequires: javapackages-tools BuildRequires: junit %if %with maven BuildRequires: maven = 1.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit jakarta-commons-vfs for openSUSE:Factory
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.0 +0200
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-vfs.new/jakarta-commons-vfs.changes
2013-09-09 13:11:30.0 +0200
@@ -1,0 +2,5 @@
+Fri Sep 6 09:14:29 UTC 2013 - mvysko...@suse.com
+
+- use add_maven_depmap
+
+---
Other differences:
--
++ jakarta-commons-vfs.spec ++
--- /var/tmp/diff_new_pack.0eURxM/_old 2013-09-09 13:11:31.0 +0200
+++ /var/tmp/diff_new_pack.0eURxM/_new 2013-09-09 13:11:31.0 +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
commit jakarta-commons-vfs for openSUSE:Factory
Hello community, here is the log from the commit of package jakarta-commons-vfs for openSUSE:Factory checked in at 2011-12-06 18:20:20 Comparing /work/SRC/openSUSE:Factory/jakarta-commons-vfs (Old) and /work/SRC/openSUSE:Factory/.jakarta-commons-vfs.new (New) Package is jakarta-commons-vfs, Maintainer is bnc-team-j...@forge.provo.novell.com Changes: Other differences: -- ++ jakarta-commons-vfs.spec ++ --- /var/tmp/diff_new_pack.HkR2G2/_old 2011-12-06 18:35:13.0 +0100 +++ /var/tmp/diff_new_pack.HkR2G2/_new 2011-12-06 18:35:13.0 +0100 @@ -29,7 +29,7 @@ Version:1.0 Release:2 Summary:Commons Virtual Filesystem -License:The Apache Software License +License:Apache-2.0 Url:http://jakarta.apache.org/commons/vfs/ Group: Development/Libraries/Java # svn export http://svn.apache.org/repos/asf/jakarta/commons/proper/vfs/tags/vfs-1.0/ @@ -119,7 +119,7 @@ %package javadoc -License:The Apache Software License +License:Apache-2.0 Summary:Commons Virtual Filesystem Group: Development/Libraries/Java @@ -150,7 +150,7 @@ %package manual -License:The Apache Software License +License:Apache-2.0 Summary:Commons Virtual Filesystem Group: Development/Libraries/Java -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
