[mongo-java-driver] Update to 2.11.2

Omair Majid omajid at fedoraproject.org
Tue Sep 3 15:33:00 UTC 2013


commit 4dd0f7226cd0516dfcbc21eb88d8b7311a40c066
Author: Omair Majid <omajid at redhat.com>
Date:   Fri Aug 30 16:59:26 2013 -0400

    Update to 2.11.2

 mongo-java-driver.spec |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)
---
diff --git a/mongo-java-driver.spec b/mongo-java-driver.spec
index d747d64..3d71d86 100644
--- a/mongo-java-driver.spec
+++ b/mongo-java-driver.spec
@@ -1,18 +1,22 @@
+%global commit 09b38d91667e4ae97a73d1c7e3251cbed7bfa000
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
 Name:		mongo-java-driver
-Version:	2.7.3
-Release:	4%{?dist}
+Version:	2.11.2
+Release:	1%{?dist}
 Summary:	A Java driver for MongoDB
 
 Group:		Development/Libraries
 BuildArch:	noarch
 License:	ASL 2.0
 URL:		http://www.mongodb.org/display/DOCS/Java+Language+Center
-Source0:	https://github.com/mongodb/mongo-java-driver/tarball/r2.7.3
+Source0:	https://github.com/mongodb/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
 
 BuildRequires:	jpackage-utils
 BuildRequires:	java-devel
 
 BuildRequires:	ant
+BuildRequires:	ant-contrib
 BuildRequires:	testng
 BuildRequires:	git
 
@@ -56,15 +60,15 @@ Requires:	jpackage-utils
 This package contains the API documentation for %{name}-bson.
 
 %prep
-%setup -q -n mongodb-mongo-java-driver-a5fae2c
+%setup -qn %{name}-%{commit}
 
 find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
 
 %build
 (
-  build-jar-repository -s -p lib testng
-  ant -Dplatforms.JDK_1.5.home=/usr/lib/jvm/java jar javadocs
+  ln -s $(build-classpath testng) lib/testng-6.3.1.jar
+  ant -Dfile.encoding=UTF-8 -Denv.JAVA_HOME=/usr/lib/jvm/java -Dplatforms.JDK_1.5.home=/usr/lib/jvm/java jar javadocs
 )
 sed -i -e "s|\$VERSION|%{version}|g" maven/maven-bson.xml maven/maven-mongo-java-driver.xml
 
@@ -80,10 +84,9 @@ install -Dpm 644 maven/maven-bson.xml %{buildroot}%{_mavenpomdir}/JPP-bson.pom
 %add_maven_depmap JPP-bson.pom bson.jar
 
 # Java-docs
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-bson
-cp -rp docs/mongo-java-driver/2.7.2 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/%{version}
-cp -rp docs/bson/2.7.2 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-bson/%{version}
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
+cp -rp docs/mongo-java-driver $RPM_BUILD_ROOT%{_javadocdir}/${name}
+cp -rp docs/bson $RPM_BUILD_ROOT%{_javadocdir}/%{name}-bson
 
 %files
 %{_javadir}/mongo.jar
@@ -106,6 +109,10 @@ cp -rp docs/bson/2.7.2 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-bson/%{version}
 %doc README.md LICENSE.txt
 
 %changelog
+* Fri Aug 30 2013 Omair Majid <omajid at redhat.com> - 2.11.2-1
+- Update to 2.11.2
+- Generate tarball from commit tag, according to packaging guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list