From d4e83a068bdf419dc86c22998f31e19550c4bc88e6e64b8ad485397180d180f3 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 28 Jan 2019 08:03:49 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-collections?expand=0&rev=27 --- apache-commons-collections.spec | 61 +++++++++------------------------ 1 file changed, 17 insertions(+), 44 deletions(-) diff --git a/apache-commons-collections.spec b/apache-commons-collections.spec index 52c02ae..a279daf 100644 --- a/apache-commons-collections.spec +++ b/apache-commons-collections.spec @@ -1,7 +1,7 @@ # # spec file for package apache-commons-collections # -# Copyright (c) 2018 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/ # @@ -24,7 +24,7 @@ Release: 0 Summary: Commons Collections Package License: Apache-2.0 Group: Development/Libraries/Java -Url: http://commons.apache.org/commons-collections/ +URL: http://commons.apache.org/commons-collections/ Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz Source1: commons-collections-testframework.pom Patch0: jakarta-commons-collections-javadoc-nonet.patch @@ -41,13 +41,11 @@ BuildRequires: apache-commons-parent BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -BuildRequires: javapackages-tools BuildRequires: junit Provides: %{short_name} = %{version}-%{release} -Obsoletes: %{short_name} = 3.2 +Obsoletes: %{short_name} < %{version}-%{release} Provides: jakarta-%{short_name} = %{version}-%{release} -Obsoletes: jakarta-%{short_name} = 3.2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Obsoletes: jakarta-%{short_name} < %{version}-%{release} BuildArch: noarch %description @@ -80,22 +78,19 @@ Requires: %{name} = %{version}-%{release} %package javadoc Summary: Javadoc for %{name} Group: Development/Libraries/Java +Provides: %{name}-testframework-javadoc = %{version}-%{release} +Obsoletes: %{name}-testframework-javadoc < %{version}-%{release} %description javadoc %{summary}. -%package testframework-javadoc -Summary: Javadoc for %{name} testframework -Group: Development/Libraries/Java - -%description testframework-javadoc -%{summary}. - %prep %setup -q -n %{short_name}-%{version}-src # remove all binary libs -find . -name "*.jar" -exec rm -f {} \; -find . -name "*.class" -exec rm -f {} \; +find . -name "*.jar" -delete +find . -name "*.class" -delete +# Fix file eof +sed -i 's/\r//' LICENSE.txt PROPOSAL.html README.txt NOTICE.txt %patch0 -p1 %patch1 @@ -112,7 +107,7 @@ sed -i 's/@VERSION@/%{version}/' pom-testframework.xml echo "junit.jar=$(build-classpath junit)" >>build.properties ant \ -Dant.build.javac.source=8 -Dant.build.javac.target=8 \ - -Dant.build.javadoc.source=8 \ + -Dant.build.javadoc.source=8 -Dtf.build.docs=build/docs/apidocs/ \ -Djava.io.tmpdir=. jar javadoc tf.validate tf.jar dist.bin dist.src tf.javadoc %install @@ -133,38 +128,16 @@ install -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -pr build/docs/apidocs/* %{buildroot}%{_javadocdir}/%{name} %fdupes -s %{buildroot}%{_javadocdir}/%{name} -# testframework-javadoc -install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-testframework -cp -pr build/docs/testframework/* %{buildroot}%{_javadocdir}/%{name}-testframework -%fdupes -s %{buildroot}%{_javadocdir}/%{name}-testframework - -%files -%defattr(0644,root,root,0755) -%doc PROPOSAL.html README.txt LICENSE.txt RELEASE-NOTES.txt NOTICE.txt +%files -f .mfiles +%license LICENSE.txt NOTICE.txt +%doc PROPOSAL.html README.txt RELEASE-NOTES.txt %{_javadir}/%{name}.jar -%{_javadir}/%{short_name}.jar -%{_mavenpomdir}/JPP-%{short_name}.pom -%{_datadir}/maven-metadata/%{name}.xml -%files testframework -%defattr(0644,root,root,0755) +%files testframework -f .mfiles-testframework %{_javadir}/%{name}-testframework.jar -%{_javadir}/%{short_name}-testframework.jar -%{_mavenpomdir}/JPP-%{short_name}-testframework.pom -%if %{defined _maven_repository} -%config(noreplace) %{_mavendepmapfragdir}/%{name}-testframework -%else -%{_datadir}/maven-metadata/%{name}-testframework.xml -%endif %files javadoc -%defattr(0644,root,root,0755) -%doc LICENSE.txt NOTICE.txt +%license LICENSE.txt NOTICE.txt %{_javadocdir}/%{name} -%files testframework-javadoc -%defattr(0644,root,root,0755) -%doc LICENSE.txt NOTICE.txt -%{_javadocdir}/%{name}-testframework - %changelog From dee303977cbd0942221f03ffb43b380187bed32300be38fccd661302f77d2abc Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 28 Jan 2019 08:09:24 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-collections?expand=0&rev=28 --- apache-commons-collections.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/apache-commons-collections.spec b/apache-commons-collections.spec index a279daf..82057ae 100644 --- a/apache-commons-collections.spec +++ b/apache-commons-collections.spec @@ -42,6 +42,7 @@ BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: junit +Requires: mvn(org.apache.commons:commons-parent:pom:) Provides: %{short_name} = %{version}-%{release} Obsoletes: %{short_name} < %{version}-%{release} Provides: jakarta-%{short_name} = %{version}-%{release} From aff13bf321f658223dc123549ef34e8c09d13ef7ad523fe9f897083e4ec4de09 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 28 Jan 2019 08:12:49 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-collections?expand=0&rev=29 --- apache-commons-collections.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-collections.spec b/apache-commons-collections.spec index 82057ae..0675183 100644 --- a/apache-commons-collections.spec +++ b/apache-commons-collections.spec @@ -78,7 +78,7 @@ Requires: %{name} = %{version}-%{release} %package javadoc Summary: Javadoc for %{name} -Group: Development/Libraries/Java +Group: Documentation/HTML Provides: %{name}-testframework-javadoc = %{version}-%{release} Obsoletes: %{name}-testframework-javadoc < %{version}-%{release} From 225d36bc71d436857f42e4256168618cdde5b0aa1cfecd0d0669bd3d1250d0f2 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 25 Mar 2019 17:25:45 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-collections?expand=0&rev=30 --- apache-commons-collections.changes | 6 ++++++ apache-commons-collections.spec | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apache-commons-collections.changes b/apache-commons-collections.changes index 21fc4ce..8f87e07 100644 --- a/apache-commons-collections.changes +++ b/apache-commons-collections.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 25 17:25:30 UTC 2019 - Fridrich Strba + +- Remove pom parent, since we don't use it when not building with + maven + ------------------------------------------------------------------- Tue Jul 10 13:02:58 UTC 2018 - fstrba@suse.com diff --git a/apache-commons-collections.spec b/apache-commons-collections.spec index 0675183..ff7f576 100644 --- a/apache-commons-collections.spec +++ b/apache-commons-collections.spec @@ -37,12 +37,10 @@ Patch4: commons-collections-3.2.2-tf.javadoc.patch Patch5: commons-collections-jdk11.patch BuildRequires: ant BuildRequires: ant-junit -BuildRequires: apache-commons-parent BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: junit -Requires: mvn(org.apache.commons:commons-parent:pom:) Provides: %{short_name} = %{version}-%{release} Obsoletes: %{short_name} < %{version}-%{release} Provides: jakarta-%{short_name} = %{version}-%{release} From ecea16fa2872298ca178fa8934e9c35076682201a20a0ccfd4008aeaaebb2019 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 25 Mar 2019 19:36:08 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-collections?expand=0&rev=31 --- apache-commons-collections.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apache-commons-collections.spec b/apache-commons-collections.spec index ff7f576..fe3ab1d 100644 --- a/apache-commons-collections.spec +++ b/apache-commons-collections.spec @@ -102,6 +102,8 @@ sed -i 's/\r//' LICENSE.txt PROPOSAL.html README.txt NOTICE.txt cp -p %{SOURCE1} pom-testframework.xml sed -i 's/@VERSION@/%{version}/' pom-testframework.xml +%pom_remove_parent . + %build echo "junit.jar=$(build-classpath junit)" >>build.properties ant \