From c4984a72f3d46401355a4ea1041539a0bede346a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 04:41:30 -0500 Subject: [PATCH 01/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- zanata-api.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zanata-api.spec b/zanata-api.spec index 6944ef4..028caf4 100644 --- a/zanata-api.spec +++ b/zanata-api.spec @@ -3,7 +3,7 @@ Name: zanata-%{shortname} Version: 2.2.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Zanata API modules Group: Development/Libraries @@ -110,6 +110,9 @@ install -pm 644 %{submodule}/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{submodul %endif %changelog +* 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} From 953e7d48beff32fbc3711be18475caf20ac54412 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Tue, 27 Aug 2013 02:22:58 -0400 Subject: [PATCH 02/28] upstream update --- zanata-api.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/zanata-api.spec b/zanata-api.spec index 028caf4..3eeb6c0 100644 --- a/zanata-api.spec +++ b/zanata-api.spec @@ -2,8 +2,8 @@ %global submodule zanata-common-%{shortname} Name: zanata-%{shortname} -Version: 2.2.0 -Release: 8%{?dist} +Version: 3.0.1 +Release: 1%{?dist} Summary: Zanata API modules Group: Development/Libraries @@ -63,6 +63,8 @@ This package contains the API documentation for %{submodule}. %prep %setup -q -n %{name}-%{shortname}-%{version} %pom_remove_plugin :maven-dependency-plugin %{submodule} +%pom_remove_plugin :gmaven-plugin %{submodule} +%pom_remove_plugin :maven-shade-plugin %{submodule} %build @@ -110,6 +112,9 @@ install -pm 644 %{submodule}/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{submodul %endif %changelog +* 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 From 85cda2e8901548ba5d2b80ec7351e05de8f3f9e9 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Tue, 27 Aug 2013 02:23:21 -0400 Subject: [PATCH 03/28] upstream source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 535b6ba..5df2c53 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /api-2.2.0.zip +/api-3.0.1.zip diff --git a/sources b/sources index d3afb34..c071c30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c63a447e8d53fd9ecfe7b8529f49abc5 api-2.2.0.zip +80d867a9695ea07339d1c9b0bab97155 api-3.0.1.zip From 3d47e12150a281fbb57ed9e16771f885a0d1fa85 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Tue, 14 Jan 2014 18:43:51 -0500 Subject: [PATCH 04/28] upgrade to 3.2.0 --- .gitignore | 1 + remove-enunciate.patch | 12 +++++++ sources | 2 +- zanata-api.spec | 77 ++++++++---------------------------------- 4 files changed, 29 insertions(+), 63 deletions(-) create mode 100644 remove-enunciate.patch diff --git a/.gitignore b/.gitignore index 5df2c53..e70b689 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /api-2.2.0.zip /api-3.0.1.zip +/api-3.2.0.zip diff --git a/remove-enunciate.patch b/remove-enunciate.patch new file mode 100644 index 0000000..72ba01f --- /dev/null +++ b/remove-enunciate.patch @@ -0,0 +1,12 @@ +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 index c071c30..ad141d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -80d867a9695ea07339d1c9b0bab97155 api-3.0.1.zip +ac37dc4f468d186857f3f4848cff069d api-3.2.0.zip diff --git a/zanata-api.spec b/zanata-api.spec index 3eeb6c0..700ea43 100644 --- a/zanata-api.spec +++ b/zanata-api.spec @@ -2,7 +2,7 @@ %global submodule zanata-common-%{shortname} Name: zanata-%{shortname} -Version: 3.0.1 +Version: 3.2.0 Release: 1%{?dist} Summary: Zanata API modules @@ -10,41 +10,11 @@ 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: maven-local -BuildRequires: maven-enforcer-plugin -BuildRequires: maven-surefire-provider-testng - -# dependencies in pom -BuildRequires: zanata-parent -BuildRequires: hamcrest -BuildRequires: testng - -# dependencies in zanata-common-api -BuildRequires: hibernate-validator -BuildRequires: jackson -BuildRequires: apache-commons-lang -BuildRequires: apache-commons-codec -BuildRequires: resteasy -%if 0%{?fedora} < 19 -BuildRequires: apache-james-project -%endif -BuildRequires: slf4j -BuildRequires: jboss-annotations-1.1-api - - -Requires: hibernate-validator -Requires: jackson -Requires: apache-commons-lang -Requires: apache-commons-codec -Requires: resteasy -Requires: slf4j -Requires: jboss-annotations-1.1-api - -Requires: jpackage-utils -Requires: java %description Zanata API modules @@ -65,53 +35,36 @@ This package contains the API documentation for %{submodule}. %pom_remove_plugin :maven-dependency-plugin %{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} +# here we replace google findbugs annotations with sourceforge one +%pom_remove_dep com.google.code.findbugs:annotations %{submodule} +%pom_xpath_inject "pom:dependencies" "net.sourceforge.findbugsannotations2.0.2" %{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 %{submodule}/src/test/java/org/zanata/rest/service/ClientJAXRSTest.java +%patch0 %build # -Dmaven.local.debug=true #%mvn_build --skip-tests -%if 0%{?fedora} > 19 %mvn_build -%endif -%if 0%{?fedora} == 19 -%mvn_build --skip-tests -%else -mvn-rpmbuild package javadoc:aggregate -Dmaven.test.skip=true -%endif %install -%if 0%{?fedora} > 18 %mvn_install -%else -mkdir -p $RPM_BUILD_ROOT%{_javadir} -cp -p %{submodule}/target/%{submodule}*-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{submodule}.jar - -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -rp target/site/apidocs $RPM_BUILD_ROOT%{_javadocdir}/%{submodule} - -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} -install -pm 644 pom.xml \ - $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom -install -pm 644 %{submodule}/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{submodule}.pom - -%add_maven_depmap JPP-%{name}.pom -%add_maven_depmap JPP-%{submodule}.pom %{submodule}.jar -%endif %files -f .mfiles -%if 0%{?fedora} > 18 %dir %{_javadir}/%{name} -%endif %doc README.txt -%if 0%{?fedora} > 18 %files javadoc -f .mfiles-javadoc -%else -%files javadoc -%{_javadocdir}/%{submodule} -%endif %changelog +* 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 From c6ee3b6b6b559211a2666dc98d630f75b2c90cc4 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Thu, 16 Jan 2014 19:52:52 -0500 Subject: [PATCH 05/28] add missing BR --- zanata-api.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/zanata-api.spec b/zanata-api.spec index 700ea43..eb3a58c 100644 --- a/zanata-api.spec +++ b/zanata-api.spec @@ -3,7 +3,7 @@ Name: zanata-%{shortname} Version: 3.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Zanata API modules Group: Development/Libraries @@ -15,6 +15,9 @@ Patch0: remove-enunciate.patch BuildArch: noarch BuildRequires: maven-local +BuildRequires: zanata-parent +BuildRequires: enunciate-core-annotations +BuildRequires: mvn(net.sourceforge.findbugs:annotations) %description Zanata API modules @@ -62,6 +65,9 @@ rm %{submodule}/src/test/java/org/zanata/rest/service/ClientJAXRSTest.java %files javadoc -f .mfiles-javadoc %changelog +* Fri Jan 17 2014 Patrick Huang 3.2.0-2 +- Add BR + * Thu Jan 09 2014 Patrick Huang 3.2.0-1 - Upstream update From e5510a7e14a4c90888407d553e0540add9ea1467 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Thu, 30 Jan 2014 01:10:14 -0500 Subject: [PATCH 06/28] upgrade to latest upstream version --- .gitignore | 1 + remove-enunciate.patch | 12 ++++++++ sources | 2 +- zanata-api.spec | 63 +++++++++++++++--------------------------- 4 files changed, 36 insertions(+), 42 deletions(-) create mode 100644 remove-enunciate.patch diff --git a/.gitignore b/.gitignore index 5df2c53..e70b689 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /api-2.2.0.zip /api-3.0.1.zip +/api-3.2.0.zip diff --git a/remove-enunciate.patch b/remove-enunciate.patch new file mode 100644 index 0000000..72ba01f --- /dev/null +++ b/remove-enunciate.patch @@ -0,0 +1,12 @@ +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 index c071c30..ad141d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -80d867a9695ea07339d1c9b0bab97155 api-3.0.1.zip +ac37dc4f468d186857f3f4848cff069d api-3.2.0.zip diff --git a/zanata-api.spec b/zanata-api.spec index 3eeb6c0..50c341b 100644 --- a/zanata-api.spec +++ b/zanata-api.spec @@ -2,23 +2,21 @@ %global submodule zanata-common-%{shortname} Name: zanata-%{shortname} -Version: 3.0.1 -Release: 1%{?dist} +Version: 3.2.0 +Release: 2%{?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: maven-local BuildRequires: maven-enforcer-plugin BuildRequires: maven-surefire-provider-testng - -# dependencies in pom -BuildRequires: zanata-parent BuildRequires: hamcrest BuildRequires: testng @@ -28,9 +26,6 @@ BuildRequires: jackson BuildRequires: apache-commons-lang BuildRequires: apache-commons-codec BuildRequires: resteasy -%if 0%{?fedora} < 19 -BuildRequires: apache-james-project -%endif BuildRequires: slf4j BuildRequires: jboss-annotations-1.1-api @@ -42,9 +37,9 @@ Requires: apache-commons-codec Requires: resteasy Requires: slf4j Requires: jboss-annotations-1.1-api - -Requires: jpackage-utils -Requires: java +BuildRequires: zanata-parent +BuildRequires: enunciate-core-annotations +BuildRequires: mvn(net.sourceforge.findbugs:annotations) %description Zanata API modules @@ -65,53 +60,39 @@ This package contains the API documentation for %{submodule}. %pom_remove_plugin :maven-dependency-plugin %{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} +# here we replace google findbugs annotations with sourceforge one +%pom_remove_dep com.google.code.findbugs:annotations %{submodule} +%pom_xpath_inject "pom:dependencies" "net.sourceforge.findbugsannotations2.0.2" %{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 %{submodule}/src/test/java/org/zanata/rest/service/ClientJAXRSTest.java +%patch0 %build # -Dmaven.local.debug=true #%mvn_build --skip-tests -%if 0%{?fedora} > 19 %mvn_build -%endif -%if 0%{?fedora} == 19 -%mvn_build --skip-tests -%else -mvn-rpmbuild package javadoc:aggregate -Dmaven.test.skip=true -%endif %install -%if 0%{?fedora} > 18 %mvn_install -%else -mkdir -p $RPM_BUILD_ROOT%{_javadir} -cp -p %{submodule}/target/%{submodule}*-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{submodule}.jar - -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -rp target/site/apidocs $RPM_BUILD_ROOT%{_javadocdir}/%{submodule} - -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} -install -pm 644 pom.xml \ - $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom -install -pm 644 %{submodule}/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{submodule}.pom - -%add_maven_depmap JPP-%{name}.pom -%add_maven_depmap JPP-%{submodule}.pom %{submodule}.jar -%endif %files -f .mfiles -%if 0%{?fedora} > 18 %dir %{_javadir}/%{name} -%endif %doc README.txt -%if 0%{?fedora} > 18 %files javadoc -f .mfiles-javadoc -%else -%files javadoc -%{_javadocdir}/%{submodule} -%endif %changelog +* 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 From 18afb55dd93800029cdf0433b5161ad9557778e7 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 28 Mar 2014 14:19:58 +0100 Subject: [PATCH 07/28] Use Requires: java-headless rebuild (#1067528) Signed-off-by: Michael Simacek Signed-off-by: Mikolaj Izdebski --- zanata-api.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zanata-api.spec b/zanata-api.spec index eb3a58c..8a30a26 100644 --- a/zanata-api.spec +++ b/zanata-api.spec @@ -3,7 +3,7 @@ Name: zanata-%{shortname} Version: 3.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Zanata API modules Group: Development/Libraries @@ -65,6 +65,9 @@ rm %{submodule}/src/test/java/org/zanata/rest/service/ClientJAXRSTest.java %files javadoc -f .mfiles-javadoc %changelog +* 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 From 6ef48c9af84442bdd48341146bab9ecf5741ea95 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Sun, 1 Jun 2014 19:39:19 -0400 Subject: [PATCH 08/28] upgrade to upstream version 3.3.1 --- zanata-api.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/zanata-api.spec b/zanata-api.spec index 8a30a26..de4beb8 100644 --- a/zanata-api.spec +++ b/zanata-api.spec @@ -2,8 +2,8 @@ %global submodule zanata-common-%{shortname} Name: zanata-%{shortname} -Version: 3.2.0 -Release: 3%{?dist} +Version: 3.3.1 +Release: 1%{?dist} Summary: Zanata API modules Group: Development/Libraries @@ -18,6 +18,7 @@ BuildRequires: maven-local BuildRequires: zanata-parent BuildRequires: enunciate-core-annotations BuildRequires: mvn(net.sourceforge.findbugs:annotations) +BuildRequires: groovy %description Zanata API modules @@ -47,6 +48,9 @@ This package contains the API documentation for %{submodule}. rm -rf %{submodule}/src/main/java/org/zanata/rest/enunciate rm -rf %{submodule}/src/test/java/org/zanata/rest/enunciate rm %{submodule}/src/test/java/org/zanata/rest/service/ClientJAXRSTest.java +# remove groovy-all and spock +%pom_remove_dep org.codehaus.groovy:groovy-all %{submodule} +%pom_remove_dep org.spockframework:spock-core %{submodule} %patch0 %build @@ -65,6 +69,9 @@ rm %{submodule}/src/test/java/org/zanata/rest/service/ClientJAXRSTest.java %files javadoc -f .mfiles-javadoc %changelog +* 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) From 2844b257144947f6719e71c0b46eb9e641c06088 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Sun, 1 Jun 2014 19:39:43 -0400 Subject: [PATCH 09/28] upload source From bd69aa8f5cc2f83337b321f32a0c939d6b1424b9 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Sun, 1 Jun 2014 19:40:23 -0400 Subject: [PATCH 10/28] upload source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e70b689..172b02e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /api-2.2.0.zip /api-3.0.1.zip /api-3.2.0.zip +/api-3.3.1.zip diff --git a/sources b/sources index ad141d8..e6e1b28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac37dc4f468d186857f3f4848cff069d api-3.2.0.zip +47a264dd91528d21f19f3982dc157f41 api-3.3.1.zip From bdbf7534d509f8cee0ae782201b170d6e747c456 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Sun, 1 Jun 2014 22:55:47 -0400 Subject: [PATCH 11/28] upgrade to latest upstream 3.3.1 --- zanata-api.spec | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/zanata-api.spec b/zanata-api.spec index 50c341b..977c5f3 100644 --- a/zanata-api.spec +++ b/zanata-api.spec @@ -2,8 +2,8 @@ %global submodule zanata-common-%{shortname} Name: zanata-%{shortname} -Version: 3.2.0 -Release: 2%{?dist} +Version: 3.3.1 +Release: 1%{?dist} Summary: Zanata API modules Group: Development/Libraries @@ -15,28 +15,6 @@ Patch0: remove-enunciate.patch BuildArch: noarch BuildRequires: maven-local -BuildRequires: maven-enforcer-plugin -BuildRequires: maven-surefire-provider-testng -BuildRequires: hamcrest -BuildRequires: testng - -# dependencies in zanata-common-api -BuildRequires: hibernate-validator -BuildRequires: jackson -BuildRequires: apache-commons-lang -BuildRequires: apache-commons-codec -BuildRequires: resteasy -BuildRequires: slf4j -BuildRequires: jboss-annotations-1.1-api - - -Requires: hibernate-validator -Requires: jackson -Requires: apache-commons-lang -Requires: apache-commons-codec -Requires: resteasy -Requires: slf4j -Requires: jboss-annotations-1.1-api BuildRequires: zanata-parent BuildRequires: enunciate-core-annotations BuildRequires: mvn(net.sourceforge.findbugs:annotations) @@ -69,6 +47,9 @@ This package contains the API documentation for %{submodule}. rm -rf %{submodule}/src/main/java/org/zanata/rest/enunciate rm -rf %{submodule}/src/test/java/org/zanata/rest/enunciate rm %{submodule}/src/test/java/org/zanata/rest/service/ClientJAXRSTest.java +# remove groovy-all and spock +%pom_remove_dep org.codehaus.groovy:groovy-all %{submodule} +%pom_remove_dep org.spockframework:spock-core %{submodule} %patch0 %build @@ -87,6 +68,12 @@ rm %{submodule}/src/test/java/org/zanata/rest/service/ClientJAXRSTest.java %files javadoc -f .mfiles-javadoc %changelog +* 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 From 0462dcb976764ee910e2442f328280c8af91080f Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Sun, 1 Jun 2014 22:56:33 -0400 Subject: [PATCH 12/28] upload source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e70b689..172b02e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /api-2.2.0.zip /api-3.0.1.zip /api-3.2.0.zip +/api-3.3.1.zip diff --git a/sources b/sources index ad141d8..e6e1b28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac37dc4f468d186857f3f4848cff069d api-3.2.0.zip +47a264dd91528d21f19f3982dc157f41 api-3.3.1.zip From f8849dbf6ea2b30a6fbf43eb991d5768b79cf0fe Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 12:59:34 -0500 Subject: [PATCH 13/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- zanata-api.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zanata-api.spec b/zanata-api.spec index de4beb8..dbfca5a 100644 --- a/zanata-api.spec +++ b/zanata-api.spec @@ -3,7 +3,7 @@ Name: zanata-%{shortname} Version: 3.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Zanata API modules Group: Development/Libraries @@ -69,6 +69,9 @@ rm %{submodule}/src/test/java/org/zanata/rest/service/ClientJAXRSTest.java %files javadoc -f .mfiles-javadoc %changelog +* 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 From dce1e51a11e13d6d52aa17985af32730bd3aabd9 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Thu, 29 Jan 2015 20:36:55 +1000 Subject: [PATCH 14/28] Upstream update to 3.4.1 --- .gitignore | 1 + sources | 2 +- zanata-api.spec | 19 +++++++++++++------ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 172b02e..e62de63 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /api-3.0.1.zip /api-3.2.0.zip /api-3.3.1.zip +/api-3.4.1.zip diff --git a/sources b/sources index e6e1b28..01baf3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -47a264dd91528d21f19f3982dc157f41 api-3.3.1.zip +90fae415b68743996dcb8888c338a6c2 api-3.4.1.zip diff --git a/zanata-api.spec b/zanata-api.spec index dbfca5a..bf78c49 100644 --- a/zanata-api.spec +++ b/zanata-api.spec @@ -1,9 +1,11 @@ %global shortname api %global submodule zanata-common-%{shortname} +%global findbugs_version 3.0.0 +%global java_version 1.7.0 Name: zanata-%{shortname} -Version: 3.3.1 -Release: 2%{?dist} +Version: 3.4.1 +Release: 1%{?dist} Summary: Zanata API modules Group: Development/Libraries @@ -19,6 +21,7 @@ BuildRequires: zanata-parent BuildRequires: enunciate-core-annotations BuildRequires: mvn(net.sourceforge.findbugs:annotations) BuildRequires: groovy +BuildRequires: findbugs %description Zanata API modules @@ -36,14 +39,15 @@ This package contains the API documentation for %{submodule}. %prep %setup -q -n %{name}-%{shortname}-%{version} -%pom_remove_plugin :maven-dependency-plugin %{submodule} +%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.codehaus.enunciate:enunciate-jersey-rt %{submodule} -# here we replace google findbugs annotations with sourceforge one -%pom_remove_dep com.google.code.findbugs:annotations %{submodule} -%pom_xpath_inject "pom:dependencies" "net.sourceforge.findbugsannotations2.0.2" %{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 @@ -69,6 +73,9 @@ rm %{submodule}/src/test/java/org/zanata/rest/service/ClientJAXRSTest.java %files javadoc -f .mfiles-javadoc %changelog +* 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 From 0ed0d4ebd9b5c75a9c9043ad638698ece2d0c663 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:42:29 +0000 Subject: [PATCH 15/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- zanata-api.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zanata-api.spec b/zanata-api.spec index bf78c49..ef88b27 100644 --- a/zanata-api.spec +++ b/zanata-api.spec @@ -5,7 +5,7 @@ Name: zanata-%{shortname} Version: 3.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Zanata API modules Group: Development/Libraries @@ -73,6 +73,9 @@ rm %{submodule}/src/test/java/org/zanata/rest/service/ClientJAXRSTest.java %files javadoc -f .mfiles-javadoc %changelog +* 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 From a501b3e866fba8dec4517c94ba1c2464893c551d Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Wed, 1 Jul 2015 13:04:39 +1000 Subject: [PATCH 16/28] Upstream update to 3.7.3 --- .gitignore | 1 + sources | 2 +- zanata-api.spec | 13 +++++++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e62de63..32360cc 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /api-3.2.0.zip /api-3.3.1.zip /api-3.4.1.zip +/api-3.7.3.zip diff --git a/sources b/sources index 01baf3f..6c59ae4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -90fae415b68743996dcb8888c338a6c2 api-3.4.1.zip +1f3858ac2b0391e1c53f40a2253ba79f api-3.7.3.zip diff --git a/zanata-api.spec b/zanata-api.spec index ef88b27..c1269b5 100644 --- a/zanata-api.spec +++ b/zanata-api.spec @@ -4,8 +4,8 @@ %global java_version 1.7.0 Name: zanata-%{shortname} -Version: 3.4.1 -Release: 2%{?dist} +Version: 3.7.3 +Release: 1%{?dist} Summary: Zanata API modules Group: Development/Libraries @@ -23,6 +23,11 @@ BuildRequires: mvn(net.sourceforge.findbugs:annotations) BuildRequires: groovy BuildRequires: findbugs +%if 0%{?fedora} >= 22 +BuildRequires: hamcrest >= 1.3 +Requires: hamcrest >= 1.3 +%endif + %description Zanata API modules @@ -73,6 +78,10 @@ rm %{submodule}/src/test/java/org/zanata/rest/service/ClientJAXRSTest.java %files javadoc -f .mfiles-javadoc %changelog +* 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 From a1b143d8a3bc9bd8a18dc188ed2b0e39912fccfe Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Thu, 12 Nov 2015 17:31:47 +1000 Subject: [PATCH 17/28] - Upgrade to upstream version 3.8.0 - --- .gitignore | 1 + sources | 2 +- zanata-api.spec | 27 +++++++++++++++++++-------- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 32360cc..b3608d3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /api-3.3.1.zip /api-3.4.1.zip /api-3.7.3.zip +/api-3.8.0.zip diff --git a/sources b/sources index 6c59ae4..7e7df6b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1f3858ac2b0391e1c53f40a2253ba79f api-3.7.3.zip +e1bd2432d2fe7a04bd48e76097148a4a api-3.8.0.zip diff --git a/zanata-api.spec b/zanata-api.spec index c1269b5..d72f7a4 100644 --- a/zanata-api.spec +++ b/zanata-api.spec @@ -1,10 +1,10 @@ %global shortname api %global submodule zanata-common-%{shortname} %global findbugs_version 3.0.0 -%global java_version 1.7.0 +%global java_ver_min 1.8.0 Name: zanata-%{shortname} -Version: 3.7.3 +Version: 3.8.0 Release: 1%{?dist} Summary: Zanata API modules @@ -16,18 +16,27 @@ Patch0: remove-enunciate.patch BuildArch: noarch -BuildRequires: maven-local -BuildRequires: zanata-parent BuildRequires: enunciate-core-annotations -BuildRequires: mvn(net.sourceforge.findbugs:annotations) -BuildRequires: groovy BuildRequires: findbugs +BuildRequires: groovy +BuildRequires: maven-local +BuildRequires: mvn(net.sourceforge.findbugs:annotations) +BuildRequires: zanata-parent >= 25 + +Requires: java >= %{java_ver_min} +Requires: jpackage-utils %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 @@ -40,8 +49,6 @@ 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 @@ -78,6 +85,10 @@ rm %{submodule}/src/test/java/org/zanata/rest/service/ClientJAXRSTest.java %files javadoc -f .mfiles-javadoc %changelog +* Wed Jul 01 2015 Ding-Yi Chen 3.8.0-1 +- Upgrade to upstream version 3.8.0 +- + * Wed Jul 01 2015 Ding-Yi Chen 3.7.3-1 - Add hamcrest for F22 and later - Upgrade to upstream version 3.7.3 From 05ee351bf9eb11cb7d2a5a21bd61b5056920bc19 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Fri, 20 Nov 2015 10:24:35 +1000 Subject: [PATCH 18/28] - Upgrade to upstream version 3.8.3 --- .gitignore | 1 + sources | 2 +- zanata-api.spec | 32 +++++++++++++++++++++++++------- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index b3608d3..2494b5d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /api-3.4.1.zip /api-3.7.3.zip /api-3.8.0.zip +/api-3.8.3.zip diff --git a/sources b/sources index 7e7df6b..9d438bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e1bd2432d2fe7a04bd48e76097148a4a api-3.8.0.zip +8e15ed70924d367a3a06d02904cc58ed api-3.8.3.zip diff --git a/zanata-api.spec b/zanata-api.spec index d72f7a4..20128ee 100644 --- a/zanata-api.spec +++ b/zanata-api.spec @@ -1,10 +1,12 @@ %global shortname api %global submodule zanata-common-%{shortname} %global findbugs_version 3.0.0 -%global java_ver_min 1.8.0 +%global java_ver_min 1.8.0 +%global jersey_ver_min 1.17.0 +%define hibernate_validator_ver %(rpm -q --qf "%%{version}" hibernate-validator) Name: zanata-%{shortname} -Version: 3.8.0 +Version: 3.8.3 Release: 1%{?dist} Summary: Zanata API modules @@ -21,10 +23,18 @@ BuildRequires: findbugs BuildRequires: groovy BuildRequires: maven-local BuildRequires: mvn(net.sourceforge.findbugs:annotations) -BuildRequires: zanata-parent >= 25 +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: osgi(com.sun.jersey.core) >= %{jersey_ver_min} -Requires: java >= %{java_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 %if 0%{?fedora} >= 22 BuildRequires: hamcrest >= 1.3 @@ -63,14 +73,19 @@ 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 %{submodule}/src/test/java/org/zanata/rest/service/ClientJAXRSTest.java +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 --skip-tests %mvn_build @@ -85,9 +100,12 @@ rm %{submodule}/src/test/java/org/zanata/rest/service/ClientJAXRSTest.java %files javadoc -f .mfiles-javadoc %changelog +* 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 From 9bafe7f87de9cfa1ad609520872475dfabb1bf69 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 04:02:33 +0000 Subject: [PATCH 19/28] - 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 20/28] - 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 21/28] 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 22/28] - 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 23/28] - 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 24/28] - 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 25/28] - 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 26/28] - 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 27/28] - 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 28/28] 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