From 9e62e4bd08fe534cb06bbda7a16f2864661275d6 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@redhat.com>
Date: Jun 10 2014 09:58:52 +0000
Subject: Fix FTBFS and @VERSION@ substitution.


Resolves:
 - RHBZ#1106228
 - RHBZ#1048200

Now also installs as mongo-java-driver{,-bson}.jar

---

diff --git a/mongo-java-driver.spec b/mongo-java-driver.spec
index ba9b597..e48fe13 100644
--- a/mongo-java-driver.spec
+++ b/mongo-java-driver.spec
@@ -1,6 +1,6 @@
 Name:		mongo-java-driver
 Version:	2.11.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A Java driver for MongoDB
 
 Group:		Development/Libraries
@@ -63,35 +63,30 @@ find -name '*.jar' -exec rm -f '{}' \;
   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
+sed -i -e "s|@VERSION@|%{version}|g" maven/maven-bson.xml maven/maven-%{name}.xml
 
 %install
 # Jars
 mkdir -p %{buildroot}%{_javadir}
-cp -p *.jar %{buildroot}%{_javadir}/
+cp -p mongo.jar %{buildroot}%{_javadir}/%{name}.jar
+cp -p bson.jar %{buildroot}%{_javadir}/%{name}-bson.jar
 
 # poms
-install -Dpm 644 maven/maven-mongo-java-driver.xml %{buildroot}%{_mavenpomdir}/JPP-mongo.pom
-install -Dpm 644 maven/maven-bson.xml %{buildroot}%{_mavenpomdir}/JPP-bson.pom
-%add_maven_depmap JPP-mongo.pom mongo.jar
-%add_maven_depmap JPP-bson.pom bson.jar
+install -Dpm 644 maven/maven-%{name}.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+install -Dpm 644 maven/maven-bson.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-bson.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%add_maven_depmap -f bson JPP-%{name}-bson.pom %{name}-bson.jar
 
 # Java-docs
 mkdir -p %{buildroot}%{_javadocdir}
-cp -rp docs/mongo-java-driver %{buildroot}%{_javadocdir}/${name}
+cp -rp docs/mongo-java-driver %{buildroot}%{_javadocdir}/%{name}
 cp -rp docs/bson %{buildroot}%{_javadocdir}/%{name}-bson
 
-%files
-%{_javadir}/mongo.jar
+%files -f .mfiles
 %doc README.md LICENSE.txt
-%{_mavenpomdir}/JPP-mongo.pom
-%{_mavendepmapfragdir}/mongo-java-driver
 
-%files bson
-%{_javadir}/bson.jar
+%files bson -f .mfiles-bson
 %doc README.md LICENSE.txt
-%{_mavenpomdir}/JPP-bson.pom
-#%{_mavendepmapfragdir}/bson
 
 %files javadoc
 %{_javadocdir}/%{name}
@@ -102,6 +97,10 @@ cp -rp docs/bson %{buildroot}%{_javadocdir}/%{name}-bson
 %doc README.md LICENSE.txt
 
 %changelog
+* Tue Jun 10 2014 Severin Gehwolf <sgehwolf@redhat.com> - 2.11.3-4
+- Fix FTBFS. Resolves RHBZ#1106228.
+- Fix @VERSION@ substitution. Resolves RHBZ#1048200.
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.11.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild