[zanata-common] upstream upgrade
Patrick Huang
pahuang at fedoraproject.org
Wed Sep 4 00:09:40 UTC 2013
commit b1f0937bff901da8519a7ff2875e054174878733
Author: Patrick Huang <pahuang at redhat.com>
Date: Tue Sep 3 20:08:32 2013 -0400
upstream upgrade
zanata-common.spec | 60 +++------------------------------------------------
1 files changed, 4 insertions(+), 56 deletions(-)
---
diff --git a/zanata-common.spec b/zanata-common.spec
index efbef8a..e3c6a55 100644
--- a/zanata-common.spec
+++ b/zanata-common.spec
@@ -7,7 +7,7 @@
%global submodule_glossary zanata-adapter-glossary
Name: zanata-%{shortname}
-Version: 3.0.1
+Version: 3.0.2
Release: 1%{?dist}
Summary: Zanata common modules
@@ -26,9 +26,6 @@ BuildRequires: maven-surefire-provider-testng
# dependencies in pom
BuildRequires: zanata-parent
BuildRequires: zanata-api
-%if 0%{?fedora} < 19
-BuildRequires: apache-james-project
-%endif
BuildRequires: slf4j
BuildRequires: testng
BuildRequires: hamcrest
@@ -94,71 +91,22 @@ This includes submodules:
%pom_remove_plugin :maven-dependency-plugin
%build
-%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 %{buildroot}%{_javadir}
-
-cp -p %{submodule_util}/target/%{submodule_util}*-%{version}.jar %{buildroot}%{_javadir}/%{submodule_util}.jar
-cp -p %{submodule_po}/target/%{submodule_po}*-%{version}.jar %{buildroot}%{_javadir}/%{submodule_po}.jar
-cp -p %{submodule_properties}/target/%{submodule_properties}*-%{version}.jar %{buildroot}%{_javadir}/%{submodule_properties}.jar
-cp -p %{submodule_xliff}/target/%{submodule_xliff}*-%{version}.jar %{buildroot}%{_javadir}/%{submodule_xliff}.jar
-cp -p %{submodule_glossary}/target/%{submodule_glossary}*-%{version}.jar %{buildroot}%{_javadir}/%{submodule_glossary}.jar
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/%{submodule_util}
-cp -rp target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/%{submodule_po}
-cp -rp target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/%{submodule_properties}
-cp -rp target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/%{submodule_xliff}
-cp -rp target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/%{submodule_glossary}
-
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-install -pm 644 %{submodule_util}/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{submodule_util}.pom
-install -pm 644 %{submodule_po}/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{submodule_po}.pom
-install -pm 644 %{submodule_properties}/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{submodule_properties}.pom
-install -pm 644 %{submodule_xliff}/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{submodule_xliff}.pom
-install -pm 644 %{submodule_glossary}/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{submodule_glossary}.pom
-
-%add_maven_depmap JPP-%{name}.pom
-%add_maven_depmap JPP-%{submodule_util}.pom %{submodule_util}.jar
-%add_maven_depmap JPP-%{submodule_po}.pom %{submodule_po}.jar
-%add_maven_depmap JPP-%{submodule_properties}.pom %{submodule_properties}.jar
-%add_maven_depmap JPP-%{submodule_xliff}.pom %{submodule_xliff}.jar
-%add_maven_depmap JPP-%{submodule_glossary}.pom %{submodule_glossary}.jar
-%endif
-
-
%files -f .mfiles
-%if 0%{?fedora} > 18
%dir %{_javadir}/%{name}
-%endif
%doc README.txt COPYING.LESSER COPYING.GPL
-%if 0%{?fedora} > 18
%files javadoc -f .mfiles-javadoc
-%else
-%files javadoc
-%{_javadocdir}/%{name}/%{submodule_util}
-%{_javadocdir}/%{name}/%{submodule_po}
-%{_javadocdir}/%{name}/%{submodule_properties}
-%{_javadocdir}/%{name}/%{submodule_xliff}
-%{_javadocdir}/%{name}/%{submodule_glossary}
-%endif
%changelog
+* Wed Sep 4 2013 Patrick Huang <pahuang at redhat.com> 3.0.2-1
+- Latest upstream version
+
* Thu Aug 22 2013 Patrick Huang <pahuang at redhat.com> 3.0.1-1
- Latest upstream version
More information about the scm-commits
mailing list