[libmatthew-java] Update to new upstream version (0.8).
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Jun 29 18:58:13 UTC 2011
commit 222ead013c51a3ce07fd5075ded3d9cbe2dd02be
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Wed Jun 29 21:56:11 2011 +0300
Update to new upstream version (0.8).
License changed to MIT.
.gitignore | 1 +
jpackage_compliance.patch | 63 ---------------------------------------------
libmatthew-java.spec | 32 ++++++----------------
sources | 2 +-
4 files changed, 11 insertions(+), 87 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index be1580e..afc5514 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
libmatthew-java-0.7.1.tar.gz
libmatthew-java-0.7.2.tar.gz
+/libmatthew-java-0.8.tar.gz
diff --git a/libmatthew-java.spec b/libmatthew-java.spec
index e2c3e0f..fc082d7 100644
--- a/libmatthew-java.spec
+++ b/libmatthew-java.spec
@@ -1,35 +1,25 @@
Name: libmatthew-java
-Version: 0.7.2
-Release: 5%{?dist}
+Version: 0.8
+Release: 1%{?dist}
Summary: A few useful Java libraries
Group: Development/Libraries
-License: LGPLv2
+License: MIT
# actual upstream:
URL: http://matthew.ath.cx/projects/java/
Source0: http://matthew.ath.cx/projects/java/%{name}-%{version}.tar.gz
-# upstream author is also the debian maintainer for this package.
-# he gets newer releases into debian before he puts them up on
-# the upstream website. so we use the "original" source from debian
-# (ie, the source before debian patches are applied to it)
-#URL: http://packages.debian.org/source/sid/%{name}
-#Source0: http://ftp.de.debian.org/debian/pool/main/libm/%{name}/%{name}_%{version}.orig.tar.gz
-
# OSGi manifests
Source1: %{name}-hexdump-osgi-MANIFEST.MF
Source2: %{name}-unix-osgi-MANIFEST.MF
Patch0: install_doc.patch
-Patch1: jpackage_compliance.patch
Patch2: classpath_fix.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: java-1.6.0-openjdk-devel
+BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
-Requires: java-1.6.0-openjdk
+Requires: java >= 1:1.6.0
Requires: jpackage-utils
%description
@@ -71,8 +61,6 @@ Javadoc for %{name}
sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH1} | patch -p1
%patch2 -p1
-#%patch3 -p1
-#%patch4 -p1
%build
@@ -89,28 +77,26 @@ jar umf %{SOURCE1} hexdump-0.2.jar
jar umf %{SOURCE2} unix-0.5.jar
%install
-rm -rf $RPM_BUILD_ROOT
make install \
DESTDIR=$RPM_BUILD_ROOT \
JARDIR=%{_libdir}/%{name} \
LIBDIR=%{_libdir}/%{name} \
DOCDIR=%{_javadocdir}/%{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
-%defattr(-,root,root,-)
%{_libdir}/%{name}
%doc COPYING INSTALL README
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/%{name}
%doc COPYING
%changelog
+* Wed Jun 29 2011 Alexander Kurtakov <akurtako at redhat.com> 0.8-1
+- Update to new upstream version (0.8).
+- License changed to MIT.
+
* Sun Feb 13 2011 Mat Booth <fedora at matbooth.co.uk> 0.7.2-5
- Inject OSGi manifests into jars so that they may be used in OSGi apps such
as Eclipse plug-ins.
diff --git a/sources b/sources
index 23fa6f6..87387ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-774e0b0b9c021acd1f2280c908865c3c libmatthew-java-0.7.2.tar.gz
+8455b8751083ce25c99c2840609271f5 libmatthew-java-0.8.tar.gz
More information about the scm-commits
mailing list