From 9bafe7f87de9cfa1ad609520872475dfabb1bf69 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 04:02:33 +0000 Subject: [PATCH 01/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- zanata-api.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zanata-api.spec b/zanata-api.spec index 20128ee..6a351b4 100644 --- a/zanata-api.spec +++ b/zanata-api.spec @@ -7,7 +7,7 @@ Name: zanata-%{shortname} Version: 3.8.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Zanata API modules Group: Development/Libraries @@ -100,6 +100,9 @@ echo "hibernate_validator_ver=%{hibernate_validator_ver}" %files javadoc -f .mfiles-javadoc %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 3.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Nov 20 2015 Ding-Yi Chen 3.8.3-1 - Upgrade to upstream version 3.8.3 From f2d40f50e3705bba7ebed2ae6c05f1478693e1bc Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Tue, 19 Apr 2016 11:09:22 +1000 Subject: [PATCH 02/10] - Upgrade to upstream version 3.8.4 --- .gitignore | 1 + sources | 2 +- zanata-api.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2494b5d..01c14ca 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /api-3.7.3.zip /api-3.8.0.zip /api-3.8.3.zip +/api-3.8.4.zip diff --git a/sources b/sources index 9d438bd..5a19d76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8e15ed70924d367a3a06d02904cc58ed api-3.8.3.zip +59eef554de9fb3b6edbb6234a9332f37 api-3.8.4.zip diff --git a/zanata-api.spec b/zanata-api.spec index 6a351b4..fb8b53c 100644 --- a/zanata-api.spec +++ b/zanata-api.spec @@ -6,8 +6,8 @@ %define hibernate_validator_ver %(rpm -q --qf "%%{version}" hibernate-validator) Name: zanata-%{shortname} -Version: 3.8.3 -Release: 2%{?dist} +Version: 3.8.4 +Release: 1%{?dist} Summary: Zanata API modules Group: Development/Libraries @@ -26,7 +26,7 @@ BuildRequires: mvn(net.sourceforge.findbugs:annotations) BuildRequires: mvn(org.hibernate:hibernate-validator) >= 4 BuildRequires: mvn(org.jboss.resteasy:resteasy-bom:pom:) >= 3.0.6 BuildRequires: mvn(org.jboss.resteasy:resteasy-multipart-provider) >= 3.0.6 -BuildRequires: zanata-parent >= 25-2 +BuildRequires: zanata-parent >= 27-1 BuildRequires: osgi(com.sun.jersey.core) >= %{jersey_ver_min} Requires: jpackage-utils @@ -100,6 +100,9 @@ echo "hibernate_validator_ver=%{hibernate_validator_ver}" %files javadoc -f .mfiles-javadoc %changelog +* Mon Apr 18 2016 Ding-Yi Chen - 3.8.4-1 +- Upgrade to upstream version 3.8.4 + * Fri Feb 05 2016 Fedora Release Engineering - 3.8.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 5aa1377bd4709e9b6dbf2183712384a5c97f66e5 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Thu, 19 May 2016 17:49:41 +1000 Subject: [PATCH 03/10] Chen --- .gitignore | 1 + sources | 2 +- zanata-api.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 01c14ca..c96a5e8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /api-3.8.0.zip /api-3.8.3.zip /api-3.8.4.zip +/api-3.9.0.zip diff --git a/sources b/sources index 5a19d76..185378a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -59eef554de9fb3b6edbb6234a9332f37 api-3.8.4.zip +e2ec554913c2b313ef0a73d1c89aec97 api-3.9.0.zip diff --git a/zanata-api.spec b/zanata-api.spec index fb8b53c..fa39b4a 100644 --- a/zanata-api.spec +++ b/zanata-api.spec @@ -6,7 +6,7 @@ %define hibernate_validator_ver %(rpm -q --qf "%%{version}" hibernate-validator) Name: zanata-%{shortname} -Version: 3.8.4 +Version: 3.9.0 Release: 1%{?dist} Summary: Zanata API modules @@ -100,6 +100,9 @@ echo "hibernate_validator_ver=%{hibernate_validator_ver}" %files javadoc -f .mfiles-javadoc %changelog +* Thu May 19 2016 Ding-Yi 3.9.0-1 +Chen + * Mon Apr 18 2016 Ding-Yi Chen - 3.8.4-1 - Upgrade to upstream version 3.8.4 From 44703c678515f7c798e5b61f7fefa961ab1c0f12 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Tue, 24 May 2016 22:39:59 +1000 Subject: [PATCH 04/10] - Upstream update to version 3.9.1 --- .gitignore | 1 + sources | 2 +- zanata-api.spec | 23 ++++++++++++----------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index c96a5e8..bdd486f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /api-3.8.3.zip /api-3.8.4.zip /api-3.9.0.zip +/api-3.9.1.zip diff --git a/sources b/sources index 185378a..acddc8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e2ec554913c2b313ef0a73d1c89aec97 api-3.9.0.zip +d9ee29671cd95bc39c9bff30cd94d57c api-3.9.1.zip diff --git a/zanata-api.spec b/zanata-api.spec index fa39b4a..abfb0c6 100644 --- a/zanata-api.spec +++ b/zanata-api.spec @@ -6,7 +6,7 @@ %define hibernate_validator_ver %(rpm -q --qf "%%{version}" hibernate-validator) Name: zanata-%{shortname} -Version: 3.9.0 +Version: 3.9.1 Release: 1%{?dist} Summary: Zanata API modules @@ -22,19 +22,19 @@ BuildRequires: enunciate-core-annotations BuildRequires: findbugs BuildRequires: groovy BuildRequires: maven-local +BuildRequires: resteasy >= 3.0.6 BuildRequires: mvn(net.sourceforge.findbugs:annotations) BuildRequires: mvn(org.hibernate:hibernate-validator) >= 4 -BuildRequires: mvn(org.jboss.resteasy:resteasy-bom:pom:) >= 3.0.6 -BuildRequires: mvn(org.jboss.resteasy:resteasy-multipart-provider) >= 3.0.6 -BuildRequires: zanata-parent >= 27-1 +BuildRequires: mvn(org.jboss.resteasy:resteasy-bom:pom:) +BuildRequires: mvn(org.jboss.resteasy:resteasy-multipart-provider) +BuildRequires: zanata-parent >= 28 BuildRequires: osgi(com.sun.jersey.core) >= %{jersey_ver_min} Requires: jpackage-utils Requires: jre >= %{java_ver_min} Requires: osgi(com.sun.jersey.core) >= %{jersey_ver_min} Requires: mvn(org.hibernate:hibernate-validator) >= 4 -Requires: mvn(org.jboss.resteasy:resteasy-bom:pom:) >= 3.0.6 -Requires: mvn(org.jboss.resteasy:resteasy-multipart-provider) >= 3.0.6 +Requires: mvn(org.jboss.resteasy:resteasy-multipart-provider) %if 0%{?fedora} >= 22 BuildRequires: hamcrest >= 1.3 @@ -65,7 +65,8 @@ This package contains the API documentation for %{submodule}. %pom_remove_plugin :gmaven-plugin %{submodule} %pom_remove_plugin :maven-shade-plugin %{submodule} %pom_remove_plugin :maven-enunciate-plugin %{submodule} -%pom_remove_dep org.codehaus.enunciate:enunciate-jersey-rt %{submodule} +#%pom_remove_dep org.codehaus.enunciate:enunciate-jersey-rt %{submodule} +%pom_remove_dep org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec %{submodule} # We use the existing findbugs in fedora # We use the existing jsr-305 in fedora %pom_xpath_inject "pom:dependencies" "org.jsr-305ri" %{submodule} @@ -82,7 +83,7 @@ rm -rf %{submodule}/src/test/java/org/zanata/rest/service/ # match version hibernate-validator %pom_xpath_set 'pom:dependencies/pom:dependency[pom:artifactId="hibernate-validator"]/pom:version' %{hibernate_validator_ver} %{submodule} -%patch0 +#%patch0 echo "hibernate_validator_ver=%{hibernate_validator_ver}" %build @@ -94,14 +95,14 @@ echo "hibernate_validator_ver=%{hibernate_validator_ver}" %mvn_install %files -f .mfiles -%dir %{_javadir}/%{name} +#%dir %{_javadir}/%{name} %doc README.txt %files javadoc -f .mfiles-javadoc %changelog -* Thu May 19 2016 Ding-Yi 3.9.0-1 -Chen +* Tue May 24 2016 Ding-Yi Chen 3.9.1-1 +- Upstream update to version 3.9.1 * Mon Apr 18 2016 Ding-Yi Chen - 3.8.4-1 - Upgrade to upstream version 3.8.4 From c85cd87e57a07a86280353ae0f67104917f48acd Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Thu, 23 Jun 2016 11:44:37 +1000 Subject: [PATCH 05/10] - Upstream update to version 3.9.1 --- zanata-api.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/zanata-api.spec b/zanata-api.spec index abfb0c6..144a2cb 100644 --- a/zanata-api.spec +++ b/zanata-api.spec @@ -3,6 +3,7 @@ %global findbugs_version 3.0.0 %global java_ver_min 1.8.0 %global jersey_ver_min 1.17.0 +%global zanata_parent_ver 28 %define hibernate_validator_ver %(rpm -q --qf "%%{version}" hibernate-validator) Name: zanata-%{shortname} @@ -27,7 +28,7 @@ BuildRequires: mvn(net.sourceforge.findbugs:annotations) BuildRequires: mvn(org.hibernate:hibernate-validator) >= 4 BuildRequires: mvn(org.jboss.resteasy:resteasy-bom:pom:) BuildRequires: mvn(org.jboss.resteasy:resteasy-multipart-provider) -BuildRequires: zanata-parent >= 28 +BuildRequires: zanata-parent >= %{zanata_parent_ver} BuildRequires: osgi(com.sun.jersey.core) >= %{jersey_ver_min} Requires: jpackage-utils @@ -65,7 +66,7 @@ This package contains the API documentation for %{submodule}. %pom_remove_plugin :gmaven-plugin %{submodule} %pom_remove_plugin :maven-shade-plugin %{submodule} %pom_remove_plugin :maven-enunciate-plugin %{submodule} -#%pom_remove_dep org.codehaus.enunciate:enunciate-jersey-rt %{submodule} +%pom_remove_dep org.codehaus.enunciate:enunciate-jersey-rt %{submodule} %pom_remove_dep org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec %{submodule} # We use the existing findbugs in fedora # We use the existing jsr-305 in fedora @@ -74,6 +75,7 @@ This package contains the API documentation for %{submodule}. # delete enunciate stuff rm -rf %{submodule}/src/main/java/org/zanata/rest/enunciate rm -rf %{submodule}/src/test/java/org/zanata/rest/enunciate +rm -rf %{submodule}/src/main/java/org/zanata/rest/service rm -rf %{submodule}/src/test/java/org/zanata/rest/dto/ rm -rf %{submodule}/src/test/java/org/zanata/rest/service/ # remove groovy-all and spock From 2b3431258b7e5668cd46b77d4bd8c8d8ab851068 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Thu, 23 Jun 2016 12:32:07 +1000 Subject: [PATCH 06/10] - Upstream update to version 3.9.1 --- zanata-api.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/zanata-api.spec b/zanata-api.spec index 144a2cb..662cc5a 100644 --- a/zanata-api.spec +++ b/zanata-api.spec @@ -22,6 +22,7 @@ BuildArch: noarch BuildRequires: enunciate-core-annotations BuildRequires: findbugs BuildRequires: groovy +BuildRequires: jboss-parent BuildRequires: maven-local BuildRequires: resteasy >= 3.0.6 BuildRequires: mvn(net.sourceforge.findbugs:annotations) From 8f1ae2e9f2a2dbe21a9ad2c92e95f2a69fd194c3 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 18 Jul 2016 11:05:02 +1000 Subject: [PATCH 07/10] - Add build require enunciate --- zanata-api.spec | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/zanata-api.spec b/zanata-api.spec index 662cc5a..7a296c8 100644 --- a/zanata-api.spec +++ b/zanata-api.spec @@ -1,14 +1,20 @@ %global shortname api %global submodule zanata-common-%{shortname} -%global findbugs_version 3.0.0 +%define hibernate_validator_ver %(rpm -q --qf "%%{version}" hibernate-validator) +%define enunciate_ver %(rpm -q --qf "%%{version}" enunciate) +%global findbugs_ver_min 3.0.0 +%global javac_source_ver 1.8 +%global java_ver_min %{javac_source_ver}.0 +%global jersey_ver_min 1.17 +%global resteasy_ver_min 3.0.6 +%global zanata_parent_ver 28 + %global java_ver_min 1.8.0 %global jersey_ver_min 1.17.0 -%global zanata_parent_ver 28 -%define hibernate_validator_ver %(rpm -q --qf "%%{version}" hibernate-validator) Name: zanata-%{shortname} Version: 3.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Zanata API modules Group: Development/Libraries @@ -19,12 +25,13 @@ Patch0: remove-enunciate.patch BuildArch: noarch -BuildRequires: enunciate-core-annotations -BuildRequires: findbugs +BuildRequires: findbugs >= %{findbugs_ver_min} BuildRequires: groovy BuildRequires: jboss-parent BuildRequires: maven-local -BuildRequires: resteasy >= 3.0.6 +BuildRequires: resteasy >= %{resteasy_ver_min} +BuildRequires: mvn(org.codehaus.enunciate:enunciate-core-annotations) +BuildRequires: mvn(org.codehaus.enunciate:enunciate-jersey-rt) BuildRequires: mvn(net.sourceforge.findbugs:annotations) BuildRequires: mvn(org.hibernate:hibernate-validator) >= 4 BuildRequires: mvn(org.jboss.resteasy:resteasy-bom:pom:) @@ -67,18 +74,17 @@ This package contains the API documentation for %{submodule}. %pom_remove_plugin :gmaven-plugin %{submodule} %pom_remove_plugin :maven-shade-plugin %{submodule} %pom_remove_plugin :maven-enunciate-plugin %{submodule} -%pom_remove_dep org.codehaus.enunciate:enunciate-jersey-rt %{submodule} %pom_remove_dep org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec %{submodule} # We use the existing findbugs in fedora # We use the existing jsr-305 in fedora %pom_xpath_inject "pom:dependencies" "org.jsr-305ri" %{submodule} + # delete enunciate stuff rm -rf %{submodule}/src/main/java/org/zanata/rest/enunciate rm -rf %{submodule}/src/test/java/org/zanata/rest/enunciate -rm -rf %{submodule}/src/main/java/org/zanata/rest/service rm -rf %{submodule}/src/test/java/org/zanata/rest/dto/ -rm -rf %{submodule}/src/test/java/org/zanata/rest/service/ +rm -rf %{submodule}/src/test/java/org/zanata/rest/service # remove groovy-all and spock %pom_remove_dep org.codehaus.groovy:groovy-all %{submodule} %pom_remove_dep org.spockframework:spock-core %{submodule} @@ -91,8 +97,7 @@ echo "hibernate_validator_ver=%{hibernate_validator_ver}" %build # -Dmaven.local.debug=true -#%mvn_build --skip-tests -%mvn_build +%mvn_build -- -Denunciate.version=%{enunciate_ver} %install %mvn_install @@ -104,6 +109,9 @@ echo "hibernate_validator_ver=%{hibernate_validator_ver}" %files javadoc -f .mfiles-javadoc %changelog +* Sun Jul 17 2016 Ding-Yi Chen 3.9.1-2 +- Add build require enunciate + * Tue May 24 2016 Ding-Yi Chen 3.9.1-1 - Upstream update to version 3.9.1 From 3ea38411f4196a246aaa9dc010ccd6353ab1b1c6 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Tue, 2 Aug 2016 14:53:06 +1000 Subject: [PATCH 08/10] - Use resteasy client instead of resteasy --- zanata-api.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/zanata-api.spec b/zanata-api.spec index 7a296c8..4b26845 100644 --- a/zanata-api.spec +++ b/zanata-api.spec @@ -6,15 +6,14 @@ %global javac_source_ver 1.8 %global java_ver_min %{javac_source_ver}.0 %global jersey_ver_min 1.17 -%global resteasy_ver_min 3.0.6 -%global zanata_parent_ver 28 +%global zanata_parent_verrel 28-3 %global java_ver_min 1.8.0 %global jersey_ver_min 1.17.0 Name: zanata-%{shortname} Version: 3.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Zanata API modules Group: Development/Libraries @@ -29,15 +28,13 @@ BuildRequires: findbugs >= %{findbugs_ver_min} BuildRequires: groovy BuildRequires: jboss-parent BuildRequires: maven-local -BuildRequires: resteasy >= %{resteasy_ver_min} +BuildRequires: mvn(net.sourceforge.findbugs:annotations) BuildRequires: mvn(org.codehaus.enunciate:enunciate-core-annotations) BuildRequires: mvn(org.codehaus.enunciate:enunciate-jersey-rt) -BuildRequires: mvn(net.sourceforge.findbugs:annotations) BuildRequires: mvn(org.hibernate:hibernate-validator) >= 4 -BuildRequires: mvn(org.jboss.resteasy:resteasy-bom:pom:) -BuildRequires: mvn(org.jboss.resteasy:resteasy-multipart-provider) -BuildRequires: zanata-parent >= %{zanata_parent_ver} +BuildRequires: mvn(org.jboss.resteasy:resteasy-multipart-provider) BuildRequires: osgi(com.sun.jersey.core) >= %{jersey_ver_min} +BuildRequires: zanata-parent >= %{zanata_parent_verrel} Requires: jpackage-utils Requires: jre >= %{java_ver_min} @@ -109,6 +106,9 @@ echo "hibernate_validator_ver=%{hibernate_validator_ver}" %files javadoc -f .mfiles-javadoc %changelog +* Tue Aug 02 2016 Ding-Yi Chen 3.9.1-3 +- Use resteasy client instead of resteasy + * Sun Jul 17 2016 Ding-Yi Chen 3.9.1-2 - Add build require enunciate From f8cc5341c2681b419f6272c4d8ad7b3f3902a067 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 18:21:01 +0000 Subject: [PATCH 09/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- zanata-api.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zanata-api.spec b/zanata-api.spec index 4b26845..f32c91c 100644 --- a/zanata-api.spec +++ b/zanata-api.spec @@ -13,7 +13,7 @@ Name: zanata-%{shortname} Version: 3.9.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Zanata API modules Group: Development/Libraries @@ -106,6 +106,9 @@ echo "hibernate_validator_ver=%{hibernate_validator_ver}" %files javadoc -f .mfiles-javadoc %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 3.9.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Aug 02 2016 Ding-Yi Chen 3.9.1-3 - Use resteasy client instead of resteasy From 2d80fa8e9942179ad662d0ab808de65616caa829 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Sun, 30 Apr 2017 17:21:47 +0200 Subject: [PATCH 10/10] 2017-04-30: Retired orphaned package, because it was orphaned for more than six weeks. --- .gitignore | 11 --- dead.package | 3 + remove-enunciate.patch | 12 --- sources | 1 - zanata-api.spec | 187 ----------------------------------------- 5 files changed, 3 insertions(+), 211 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 remove-enunciate.patch delete mode 100644 sources delete mode 100644 zanata-api.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index bdd486f..0000000 --- a/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -/api-2.2.0.zip -/api-3.0.1.zip -/api-3.2.0.zip -/api-3.3.1.zip -/api-3.4.1.zip -/api-3.7.3.zip -/api-3.8.0.zip -/api-3.8.3.zip -/api-3.8.4.zip -/api-3.9.0.zip -/api-3.9.1.zip diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5d8b605 --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +2017-04-30: Retired orphaned package, because it was orphaned for +more than six weeks. + diff --git a/remove-enunciate.patch b/remove-enunciate.patch deleted file mode 100644 index 72ba01f..0000000 --- a/remove-enunciate.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git zanata-common-api/src/main/java/org/zanata/rest/service/VersionResource.java zanata-common-api/src/main/java/org/zanata/rest/service/VersionResource.java -index 260ca14..2499192 100644 ---- zanata-common-api/src/main/java/org/zanata/rest/service/VersionResource.java -+++ zanata-common-api/src/main/java/org/zanata/rest/service/VersionResource.java -@@ -30,7 +30,6 @@ import org.codehaus.enunciate.jaxrs.TypeHint; - import org.zanata.rest.MediaTypes; - import org.zanata.rest.dto.VersionInfo; - --@org.codehaus.enunciate.modules.jersey.ExternallyManagedLifecycle - @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - public interface VersionResource { diff --git a/sources b/sources deleted file mode 100644 index acddc8a..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -d9ee29671cd95bc39c9bff30cd94d57c api-3.9.1.zip diff --git a/zanata-api.spec b/zanata-api.spec deleted file mode 100644 index f32c91c..0000000 --- a/zanata-api.spec +++ /dev/null @@ -1,187 +0,0 @@ -%global shortname api -%global submodule zanata-common-%{shortname} -%define hibernate_validator_ver %(rpm -q --qf "%%{version}" hibernate-validator) -%define enunciate_ver %(rpm -q --qf "%%{version}" enunciate) -%global findbugs_ver_min 3.0.0 -%global javac_source_ver 1.8 -%global java_ver_min %{javac_source_ver}.0 -%global jersey_ver_min 1.17 -%global zanata_parent_verrel 28-3 - -%global java_ver_min 1.8.0 -%global jersey_ver_min 1.17.0 - -Name: zanata-%{shortname} -Version: 3.9.1 -Release: 4%{?dist} -Summary: Zanata API modules - -Group: Development/Libraries -License: LGPLv2+ -URL: https://github.com/zanata/%{name} -Source0: https://github.com/zanata/%{name}/archive/%{shortname}-%{version}.zip -Patch0: remove-enunciate.patch - -BuildArch: noarch - -BuildRequires: findbugs >= %{findbugs_ver_min} -BuildRequires: groovy -BuildRequires: jboss-parent -BuildRequires: maven-local -BuildRequires: mvn(net.sourceforge.findbugs:annotations) -BuildRequires: mvn(org.codehaus.enunciate:enunciate-core-annotations) -BuildRequires: mvn(org.codehaus.enunciate:enunciate-jersey-rt) -BuildRequires: mvn(org.hibernate:hibernate-validator) >= 4 -BuildRequires: mvn(org.jboss.resteasy:resteasy-multipart-provider) -BuildRequires: osgi(com.sun.jersey.core) >= %{jersey_ver_min} -BuildRequires: zanata-parent >= %{zanata_parent_verrel} - -Requires: jpackage-utils -Requires: jre >= %{java_ver_min} -Requires: osgi(com.sun.jersey.core) >= %{jersey_ver_min} -Requires: mvn(org.hibernate:hibernate-validator) >= 4 -Requires: mvn(org.jboss.resteasy:resteasy-multipart-provider) - -%if 0%{?fedora} >= 22 -BuildRequires: hamcrest >= 1.3 -Requires: hamcrest >= 1.3 -%endif - -%if "%{?el6}" -BuildRequires: java-%{java_ver_min}-openjdk-devel -%else -BuildRequires: java-devel >= %{java_ver_min} -%endif - -%description -Zanata API modules - -%package javadoc -Summary: Javadocs for %{submodule} -Group: Documentation -Requires: jpackage-utils -Requires: %{name} = %{version}-%{release} - -%description javadoc -This package contains the API documentation for %{submodule}. - -%prep -%setup -q -n %{name}-%{shortname}-%{version} -%pom_remove_plugin :findbugs-maven-plugin -%pom_remove_plugin :gmaven-plugin %{submodule} -%pom_remove_plugin :maven-shade-plugin %{submodule} -%pom_remove_plugin :maven-enunciate-plugin %{submodule} -%pom_remove_dep org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec %{submodule} -# We use the existing findbugs in fedora -# We use the existing jsr-305 in fedora -%pom_xpath_inject "pom:dependencies" "org.jsr-305ri" %{submodule} - - -# delete enunciate stuff -rm -rf %{submodule}/src/main/java/org/zanata/rest/enunciate -rm -rf %{submodule}/src/test/java/org/zanata/rest/enunciate -rm -rf %{submodule}/src/test/java/org/zanata/rest/dto/ -rm -rf %{submodule}/src/test/java/org/zanata/rest/service -# remove groovy-all and spock -%pom_remove_dep org.codehaus.groovy:groovy-all %{submodule} -%pom_remove_dep org.spockframework:spock-core %{submodule} - -# match version hibernate-validator -%pom_xpath_set 'pom:dependencies/pom:dependency[pom:artifactId="hibernate-validator"]/pom:version' %{hibernate_validator_ver} %{submodule} - -#%patch0 -echo "hibernate_validator_ver=%{hibernate_validator_ver}" - -%build -# -Dmaven.local.debug=true -%mvn_build -- -Denunciate.version=%{enunciate_ver} - -%install -%mvn_install - -%files -f .mfiles -#%dir %{_javadir}/%{name} -%doc README.txt - -%files javadoc -f .mfiles-javadoc - -%changelog -* Sat Feb 11 2017 Fedora Release Engineering - 3.9.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Aug 02 2016 Ding-Yi Chen 3.9.1-3 -- Use resteasy client instead of resteasy - -* Sun Jul 17 2016 Ding-Yi Chen 3.9.1-2 -- Add build require enunciate - -* Tue May 24 2016 Ding-Yi Chen 3.9.1-1 -- Upstream update to version 3.9.1 - -* Mon Apr 18 2016 Ding-Yi Chen - 3.8.4-1 -- Upgrade to upstream version 3.8.4 - -* Fri Feb 05 2016 Fedora Release Engineering - 3.8.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Nov 20 2015 Ding-Yi Chen 3.8.3-1 -- Upgrade to upstream version 3.8.3 - -* Wed Jul 01 2015 Ding-Yi Chen 3.8.0-1 -- Upgrade to upstream version 3.8.0 -- Require Java 1.8 now. - -* Wed Jul 01 2015 Ding-Yi Chen 3.7.3-1 -- Add hamcrest for F22 and later -- Upgrade to upstream version 3.7.3 - -* Fri Jun 19 2015 Fedora Release Engineering - 3.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Jan 29 2015 Ding-Yi Chen 3.4.1-1 -- Upgrade to upstream version 3.4.1 - -* Sat Jun 07 2014 Fedora Release Engineering - 3.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 30 2014 Patrick Huang - 3.3.1-1 -- Upgrade to upstream version 3.3.1 - -* Fri Mar 28 2014 Michael Simacek - 3.2.0-3 -- Use Requires: java-headless rebuild (#1067528) - -* Fri Jan 17 2014 Patrick Huang 3.2.0-2 -- Add BR - -* Thu Jan 09 2014 Patrick Huang 3.2.0-1 -- Upstream update - -* Thu Aug 22 2013 Patrick Huang 3.0.1-1 -- Latest upstream version - -* Sun Aug 04 2013 Fedora Release Engineering - 2.2.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri May 3 2013 Patrick Huang 2.2.0-7 -- Remove javadoc subpackage require %{?_isa} - -* Tue Apr 23 2013 Patrick Huang 2.2.0-6 -- Change license to LGPLv2+ and add subpackage requires according to review - -* Tue Apr 23 2013 Patrick Huang 2.2.0-5 -- Add BR apache-james-project for f19- - -* Mon Apr 22 2013 Patrick Huang 2.2.0-4 -- Disable test in f19 due to hamcrest compatibility bug - -* Mon Apr 22 2013 Patrick Huang 2.2.0-3 -- Add conditional build for f19- - -* Wed Apr 17 2013 Patrick Huang 2.2.0-2 -- Remove conditional build - -* Wed Feb 27 2013 Patrick Huang 2.2.0-1 -- Upstream update to version 2.2.0 - -* Thu Feb 7 2013 Patrick Huang 2.1.0-1 -- Initial RPM package