[c3p0/f19] Use included pom file

mbooth mbooth at fedoraproject.org
Tue Apr 2 10:11:07 UTC 2013


commit 02dd9f2a61d5271b93ee5de48d594bd24326de9a
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Tue Apr 2 11:08:14 2013 +0100

    Use included pom file
    
    - Update project URL

 .gitignore |    3 +--
 c3p0.pom   |   14 --------------
 c3p0.spec  |   30 ++++++++++++++++++------------
 sources    |    2 +-
 4 files changed, 20 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e60be53..1561d23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/c3p0-0.9.2-pre1.src.tgz
-/c3p0-0.9.2.1.tar.gz
+/c3p0-0.9.2.1-final.tar.gz
diff --git a/c3p0.spec b/c3p0.spec
index eac27b2..ca8d0d1 100644
--- a/c3p0.spec
+++ b/c3p0.spec
@@ -1,25 +1,22 @@
 Name:    c3p0
 Version: 0.9.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: JDBC DataSources/Resource Pools
 License: LGPLv2 or EPL
-URL:     http://sourceforge.net/projects/c3p0
+URL:     https://github.com/swaldman/c3p0
 Group:   Development/Libraries
 
 BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: java-javadoc >= 1:1.6.0
 BuildRequires: jpackage-utils
 BuildRequires: ant
-BuildRequires: mchange-commons
+BuildRequires: mchange-commons >= 0.2.3.4
 
 Requires: java
-Requires: mchange-commons
+Requires: mchange-commons >= 0.2.3.4
 Requires: jpackage-utils
 
-Source0: https://github.com/swaldman/%{name}/archive/%{name}-%{version}.tar.gz
-
-# POM based on the one found at http://mvnrepository.com/artifact/c3p0/c3p0
-Source1: c3p0.pom
+Source0: https://github.com/swaldman/%{name}/archive/%{name}-%{version}-final.tar.gz
 
 # Patch to build on java 1.6
 Patch0: %{name}-build-on-1.6.patch
@@ -44,7 +41,7 @@ Requires: jpackage-utils
 %{summary}.
 
 %prep
-%setup -q -n %{name}-%{name}-%{version}
+%setup -q -n %{name}-%{name}-%{version}-final
 
 %patch0 -p1 -b .java6
 %patch1 -p1 -b .java7
@@ -58,9 +55,14 @@ sed -i.bak -e "s/<attribute\ name=\"Class-Path\"\ value=\"\${mchange-commons-jav
 
 %build
 ant \
+  -Dbuild.sysclasspath=first \
   -Dmchange-commons-java.jar.file=`build-classpath mchange-commons-java` \
   jar javadoc
 
+sed -i -e "s|@c3p0.version.maven@|%{version}|g" \
+  -e "s|@mchange-commons-java.version.maven@|0.2.3.4|g" \
+  src/maven/pom.xml
+
 %install
 # jar
 install -d -m 755 %{buildroot}%{_javadir}
@@ -73,7 +75,7 @@ cp -pr build/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -p -m 644 %{SOURCE1} \
+install -p -m 644 src/maven/pom.xml \
   %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
 %add_maven_depmap JPP-%{name}.pom %{name}.jar
@@ -83,15 +85,19 @@ install -p -m 644 %{SOURCE1} \
 %doc src/dist-static/LICENSE*
 %doc src/dist-static/RELEASE*
 %doc src/doc/index.html
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
 %{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-*
+%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
 %doc src/dist-static/LICENSE*
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Apr 02 2013 Mat Booth <fedora at matbooth.co.uk> - 0.9.2.1-2
+- Use included pom file
+- Update project URL
+
 * Thu Mar 28 2013 Mat Booth <fedora at matbooth.co.uk> - 0.9.2.1-1
 - Update to latest upstream release
 - License change to "LGPLv2 or EPL"
diff --git a/sources b/sources
index 26fa605..c31b8b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-07f89b8a8c66f743b3b6ebbcc8ed3b5b  c3p0-0.9.2.1.tar.gz
+ddcfd62559e47f7cbd7e5676a70f31b8  c3p0-0.9.2.1-final.tar.gz


More information about the scm-commits mailing list