[mchange-commons/f19] Include pom file

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


commit 556d233b6ea2847c8f118a1e70ce7cbb5498d7dc
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Tue Apr 2 11:08:04 2013 +0100

    Include pom file
    
    - Update project URL

 .gitignore           |    1 -
 mchange-commons.spec |   20 ++++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c308adb..f3eeb87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-mchange-commons-20110130hg.tar.gz
 /mchange-commons-java-0.2.3.4-final.tar.gz
diff --git a/mchange-commons.spec b/mchange-commons.spec
index ef88d4b..5a2b35e 100644
--- a/mchange-commons.spec
+++ b/mchange-commons.spec
@@ -1,9 +1,9 @@
 Name:    mchange-commons
 Version: 0.2.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A collection of general purpose utilities for c3p0
 License: LGPLv2 or EPL
-URL:     http://sourceforge.net/projects/c3p0
+URL:     https://github.com/swaldman/mchange-commons-java
 Group:   Development/Libraries
 
 BuildRequires: java-devel >= 1:1.6.0
@@ -55,6 +55,9 @@ ant \
   -Djunit.jar.file=`build-classpath junit` \
   -Dlog4j.jar.file=`build-classpath log4j`
 
+sed -i -e "s|@mchange-commons-java.version.maven@|%{version}|g" \
+  src/maven/pom.xml
+
 %install
 # jar
 install -d -m 755 %{buildroot}%{_javadir}
@@ -65,15 +68,28 @@ install -p -m 644 build/%{name}-java-%{version}.jar \
 install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr build/javadoc/* %{buildroot}%{_javadocdir}/%{name}
 
+# pom
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -p -m 644 src/maven/pom.xml \
+  %{buildroot}%{_mavenpomdir}/JPP-%{name}-java.pom
+
+%add_maven_depmap JPP-%{name}-java.pom %{name}-java.jar
+
 %files
 %doc LICENSE*
 %{_javadir}/*
+%{_mavenpomdir}/JPP-*
+%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
 %doc LICENSE*
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Apr 02 2013 Mat Booth <fedora at matbooth.co.uk> - 0.2.3.4-2
+- Include pom file
+- Update project URL
+
 * Thu Mar 28 2013 Mat Booth <fedora at matbooth.co.uk> - 0.2.3.4-1
 - Update to latest upstream release
 - License change to "LGPLv2 or EPL"


More information about the scm-commits mailing list