From acd9bf0a20bc857b20193549fb4dfa074c022cb9d501aab6580fe52b9873b10a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 27 Dec 2018 21:03:18 +0000 Subject: [PATCH 1/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/felix-parent?expand=0&rev=4 --- felix-parent.spec | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/felix-parent.spec b/felix-parent.spec index 440586e..42cc77e 100644 --- a/felix-parent.spec +++ b/felix-parent.spec @@ -25,7 +25,7 @@ Group: Development/Libraries/Java URL: http://felix.apache.org/ Source0: http://repo1.maven.org/maven2/org/apache/felix/felix-parent/%{version}/%{name}-%{version}-source-release.tar.gz BuildRequires: javapackages-local -Requires: apache-parent +BuildRequires: mvn(org.apache:apache:pom:) BuildArch: noarch %description @@ -52,14 +52,8 @@ install -d -m 755 %{buildroot}%{_mavenpomdir} install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom %add_maven_depmap %{name}-%{version}.pom -a org.apache.felix:felix -%files +%files -f .mfiles %license LICENSE %doc NOTICE -%{_mavenpomdir}/* -%if %{defined _maven_repository} -%{_mavendepmapfragdir}/%{name} -%else -%{_datadir}/maven-metadata/%{name}.xml* -%endif %changelog From b490f577daf76affbdc76ebdb4ae2872773f16891ef7f07fbd6a8de909d14e3b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 7 Feb 2019 07:24:56 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/felix-parent?expand=0&rev=5 --- felix-parent.changes | 5 +++++ felix-parent.spec | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/felix-parent.changes b/felix-parent.changes index 6399405..42dd475 100644 --- a/felix-parent.changes +++ b/felix-parent.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 7 07:24:28 UTC 2019 - Fridrich Strba + +- Clean the spec file + ------------------------------------------------------------------- Tue Dec 18 08:51:09 UTC 2018 - Fridrich Strba diff --git a/felix-parent.spec b/felix-parent.spec index 42cc77e..440586e 100644 --- a/felix-parent.spec +++ b/felix-parent.spec @@ -25,7 +25,7 @@ Group: Development/Libraries/Java URL: http://felix.apache.org/ Source0: http://repo1.maven.org/maven2/org/apache/felix/felix-parent/%{version}/%{name}-%{version}-source-release.tar.gz BuildRequires: javapackages-local -BuildRequires: mvn(org.apache:apache:pom:) +Requires: apache-parent BuildArch: noarch %description @@ -52,8 +52,14 @@ install -d -m 755 %{buildroot}%{_mavenpomdir} install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom %add_maven_depmap %{name}-%{version}.pom -a org.apache.felix:felix -%files -f .mfiles +%files %license LICENSE %doc NOTICE +%{_mavenpomdir}/* +%if %{defined _maven_repository} +%{_mavendepmapfragdir}/%{name} +%else +%{_datadir}/maven-metadata/%{name}.xml* +%endif %changelog From a5b301d403d8cf3e9591ceadb1589d313bfe21bee0e4eb77c6041a165f3c3c9c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 7 Feb 2019 07:25:03 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/felix-parent?expand=0&rev=6 --- felix-parent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/felix-parent.spec b/felix-parent.spec index 440586e..0a2ff45 100644 --- a/felix-parent.spec +++ b/felix-parent.spec @@ -1,7 +1,7 @@ # # spec file for package felix-parent # -# 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 From 24e6b66febb3bde126bec2341e125a02d5dd92a4cdb893eea890da7f67715a35 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 7 Feb 2019 07:29:04 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/felix-parent?expand=0&rev=7 --- felix-parent.spec | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/felix-parent.spec b/felix-parent.spec index 0a2ff45..ef1f520 100644 --- a/felix-parent.spec +++ b/felix-parent.spec @@ -25,7 +25,7 @@ Group: Development/Libraries/Java URL: http://felix.apache.org/ Source0: http://repo1.maven.org/maven2/org/apache/felix/felix-parent/%{version}/%{name}-%{version}-source-release.tar.gz BuildRequires: javapackages-local -Requires: apache-parent +BuildRequires: mvn(org.apache:apache:pom:) BuildArch: noarch %description @@ -52,14 +52,8 @@ install -d -m 755 %{buildroot}%{_mavenpomdir} install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom %add_maven_depmap %{name}-%{version}.pom -a org.apache.felix:felix -%files +%files -f .mfiles %license LICENSE %doc NOTICE -%{_mavenpomdir}/* -%if %{defined _maven_repository} -%{_mavendepmapfragdir}/%{name} -%else -%{_datadir}/maven-metadata/%{name}.xml* -%endif %changelog From 2e345e7007704dea31a60d0cd52fed152a2bc5c6e272fd89f08234906f66bd42 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 7 Feb 2019 11:04:21 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/felix-parent?expand=0&rev=8 --- felix-parent.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/felix-parent.spec b/felix-parent.spec index ef1f520..7a92426 100644 --- a/felix-parent.spec +++ b/felix-parent.spec @@ -26,6 +26,7 @@ URL: http://felix.apache.org/ Source0: http://repo1.maven.org/maven2/org/apache/felix/felix-parent/%{version}/%{name}-%{version}-source-release.tar.gz BuildRequires: javapackages-local BuildRequires: mvn(org.apache:apache:pom:) +Requires: mvn(org.apache:apache:pom:) BuildArch: noarch %description From e7e35bac6b30f36de95e86663a514574088192a6161d375699c4e343509c124b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 7 Feb 2019 11:20:43 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/felix-parent?expand=0&rev=9 --- felix-parent.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/felix-parent.spec b/felix-parent.spec index 7a92426..2eb2f90 100644 --- a/felix-parent.spec +++ b/felix-parent.spec @@ -40,6 +40,7 @@ Parent POM file for Apache Felix Specs. %pom_remove_plugin org.codehaus.mojo:ianal-maven-plugin %pom_remove_plugin :apache-rat-plugin %pom_remove_plugin :animal-sniffer-maven-plugin +%pom_remove_plugin :maven-enforcer-plugin # wagon ssh dependency unneeded %pom_xpath_remove pom:extensions