[mchange-commons/f19] Update to latest upstream release
mbooth
mbooth at fedoraproject.org
Thu Mar 28 15:22:14 UTC 2013
commit 9c1b8cf38d98ea2253aefa5f984737780d90f2ef
Author: Mat Booth <fedora at matbooth.co.uk>
Date: Thu Mar 28 15:21:08 2013 +0000
Update to latest upstream release
- License change to "LGPLv2 or EPL"
.gitignore | 1 +
mchange-commons-javadoc.patch | 32 --------------------------
mchange-commons-jdbc-4.1.patch | 9 +++----
mchange-commons-remove-weakness-test.patch | 9 ++++---
mchange-commons.spec | 34 ++++++++++++---------------
sources | 2 +-
6 files changed, 26 insertions(+), 61 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 006707c..c308adb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
mchange-commons-20110130hg.tar.gz
+/mchange-commons-java-0.2.3.4-final.tar.gz
diff --git a/mchange-commons-jdbc-4.1.patch b/mchange-commons-jdbc-4.1.patch
index 6af705b..e72442b 100644
--- a/mchange-commons-jdbc-4.1.patch
+++ b/mchange-commons-jdbc-4.1.patch
@@ -1,7 +1,6 @@
-diff -up ./src/java/com/mchange/v1/db/sql/DriverManagerDataSource.java.sav ./src/java/com/mchange/v1/db/sql/DriverManagerDataSource.java
---- ./src/java/com/mchange/v1/db/sql/DriverManagerDataSource.java.sav 2012-01-24 16:19:51.000000000 -0500
-+++ ./src/java/com/mchange/v1/db/sql/DriverManagerDataSource.java 2012-01-24 16:21:06.000000000 -0500
-@@ -31,6 +31,9 @@ import javax.naming.spi.ObjectFactory;
+--- ./src/java/com/mchange/v1/db/sql/DriverManagerDataSource.java.jdbc41 2013-03-20 10:24:27.000000000 +0000
++++ ./src/java/com/mchange/v1/db/sql/DriverManagerDataSource.java 2013-03-28 14:19:58.673058063 +0000
+@@ -43,6 +43,9 @@
import javax.sql.DataSource;
import com.mchange.io.UnsupportedVersionException;
@@ -11,7 +10,7 @@ diff -up ./src/java/com/mchange/v1/db/sql/DriverManagerDataSource.java.sav ./src
/**
* @deprecated use com.mchange.v2.c3p0.DriverManagerDataSource
*/
-@@ -144,6 +147,10 @@ public class DriverManagerDataSource imp
+@@ -156,6 +159,10 @@
}
}
diff --git a/mchange-commons-remove-weakness-test.patch b/mchange-commons-remove-weakness-test.patch
index ee41f34..65755c4 100644
--- a/mchange-commons-remove-weakness-test.patch
+++ b/mchange-commons-remove-weakness-test.patch
@@ -1,7 +1,6 @@
-diff -up ./src/java/com/mchange/v2/util/junit/DoubleWeakHashMapJUnitTestCase.java.sav ./src/java/com/mchange/v2/util/junit/DoubleWeakHashMapJUnitTestCase.java
---- ./src/java/com/mchange/v2/util/junit/DoubleWeakHashMapJUnitTestCase.java.sav 2012-01-24 16:29:35.000000000 -0500
-+++ ./src/java/com/mchange/v2/util/junit/DoubleWeakHashMapJUnitTestCase.java 2012-01-24 16:29:53.000000000 -0500
-@@ -71,40 +71,4 @@ public class DoubleWeakHashMapJUnitTestC
+--- ./src/java/com/mchange/v2/util/junit/DoubleWeakHashMapJUnitTestCase.java.testweakness 2013-03-20 10:24:27.000000000 +0000
++++ ./src/java/com/mchange/v2/util/junit/DoubleWeakHashMapJUnitTestCase.java 2013-03-28 14:30:42.928482498 +0000
+@@ -83,42 +83,4 @@
assertEquals("After removing a doubled value, size should be 2", m.size(), 2);
}
@@ -27,6 +26,8 @@ diff -up ./src/java/com/mchange/v2/util/junit/DoubleWeakHashMapJUnitTestCase.jav
-
- // let's see if we can force a deeper gc via a big array creation
- byte[] bArray = new byte[ARRAY_SZ];
+- System.gc();
+- //try { Thread.sleep(2000); } catch (InterruptedException e) { e.printStackTrace(); }
-
- assertEquals("2) Weak values should have been automatically removed (but not guaranteed! sometimes fails without a defect!)", 1, m.size());
-
diff --git a/mchange-commons.spec b/mchange-commons.spec
index 8cf69e2..ef88d4b 100644
--- a/mchange-commons.spec
+++ b/mchange-commons.spec
@@ -1,10 +1,8 @@
-%global hgcheckout 20110130hg
-
Name: mchange-commons
-Version: 0.2
-Release: 0.8.%{hgcheckout}%{?dist}
+Version: 0.2.3.4
+Release: 1%{?dist}
Summary: A collection of general purpose utilities for c3p0
-License: LGPLv2
+License: LGPLv2 or EPL
URL: http://sourceforge.net/projects/c3p0
Group: Development/Libraries
@@ -19,12 +17,7 @@ BuildRequires: log4j
Requires: jpackage-utils
Requires: java
-# This software is unreleased so generate tarball from upstream source control:
-# $ hg clone http://c3p0.hg.sourceforge.net:8000/hgroot/c3p0/mchange-commons && tar -czf mchange-commons-20110130hg.tar.gz mchange-commons
-Source0: %{name}-%{hgcheckout}.tar.gz
-
-# Patch the build to include javadocs
-Patch0: mchange-commons-javadoc.patch
+Source0: https://github.com/swaldman/%{name}-java/archive/%{name}-java-%{version}-final.tar.gz
# Patch to build with JDBC 4.1/Java 7
Patch1: mchange-commons-jdbc-4.1.patch
@@ -35,22 +28,20 @@ Patch2: mchange-commons-remove-weakness-test.patch
BuildArch: noarch
%description
-Originally part of c3p0, mchange-commons is a set of general purpose
+Originally part of c3p0, %{name} is a set of general purpose
utilities.
%package javadoc
Summary: API documentation for %{name}
Group: Documentation
Requires: jpackage-utils
-Requires: java-javadoc
%description javadoc
%{summary}.
%prep
-%setup -q -n %{name}
+%setup -q -n %{name}-java-%{name}-java-%{version}-final
-%patch0 -p0 -b .orig
%patch1 -p0 -b .jdbc41
%patch2 -p0 -b .testweakness
@@ -63,25 +54,30 @@ ant \
-Dbuild.sysclasspath=first \
-Djunit.jar.file=`build-classpath junit` \
-Dlog4j.jar.file=`build-classpath log4j`
-ant javadoc
%install
# jar
install -d -m 755 %{buildroot}%{_javadir}
-install -p -m 644 build/%{name}-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}.jar
+install -p -m 644 build/%{name}-java-%{version}.jar \
+ %{buildroot}%{_javadir}/%{name}-java.jar
# javadocs
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr docs/* %{buildroot}%{_javadocdir}/%{name}
+cp -pr build/javadoc/* %{buildroot}%{_javadocdir}/%{name}
%files
+%doc LICENSE*
%{_javadir}/*
%files javadoc
+%doc LICENSE*
%{_javadocdir}/%{name}
%changelog
+* 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"
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-0.8.20110130hg
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index f948b8c..20d527d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cd63c63a76b15e4213722135104a5b5b mchange-commons-20110130hg.tar.gz
+3cbe185dfa80c42b18b0185776126b71 mchange-commons-java-0.2.3.4-final.tar.gz
More information about the scm-commits
mailing list