rpms/libmatthew-java/devel libmatthew-java.spec, 1.6, 1.7 install_doc.patch, 1.1, 1.2 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 openjdk.patch, 1.1, NONE makefile.patch, 1.2, NONE

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/libmatthew-java/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31057/devel

Modified Files:
	libmatthew-java.spec install_doc.patch .cvsignore sources 
Removed Files:
	openjdk.patch makefile.patch 
Log Message:
* Wed Jan 13 2010 Alexander Kurtakov <akurtako at redhat.com> 0.7.2-1
- Update to upstream 0.7.2.
- Drop gcj_support.


Index: libmatthew-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmatthew-java/devel/libmatthew-java.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libmatthew-java.spec	25 Jul 2009 06:04:21 -0000	1.6
+++ libmatthew-java.spec	13 Jan 2010 13:24:58 -0000	1.7
@@ -1,8 +1,6 @@
-%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
-
 Name:           libmatthew-java
-Version:        0.7.1
-Release:        6%{?dist}
+Version:        0.7.2
+Release:        1%{?dist}
 Summary:        A few useful Java libraries
 Group:          Development/Libraries
 License:        LGPLv2
@@ -20,8 +18,6 @@ Source0: http://matthew.ath.cx/projects/
 Patch0:         install_doc.patch
 Patch1:         jpackage_compliance.patch
 Patch2:         classpath_fix.patch
-Patch3:         openjdk.patch
-Patch4:         makefile.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -31,13 +27,6 @@ BuildRequires:  jpackage-utils
 Requires:       java-1.6.0-openjdk
 Requires:       jpackage-utils
 
-%if %{with_gcj}
-BuildRequires:    java-gcj-compat-devel >= 1.0.31
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-%endif
-
-
 %description
 A colleciton of Java libraries:
 - Unix Sockets Library
@@ -77,8 +66,8 @@ Javadoc for %{name}
 sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH1} | patch -p1 
 
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
+#%patch3 -p1
+#%patch4 -p1
 
 
 %build
@@ -98,49 +87,24 @@ make install \
     LIBDIR=%{_libdir}/%{name} \
     DOCDIR=%{_javadocdir}/%{name}
 
-%if %{with_gcj}
-%{_bindir}/aot-compile-rpm
-%endif
-
-
-%post
-%if %{with_gcj}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-    then
-    %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-
-%postun
-%if %{with_gcj}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-    then
-    %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
 %{_libdir}/%{name}
 %doc COPYING INSTALL README
 
-%if %{with_gcj}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
-
-
 %files javadoc
 %defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
 
 %changelog
+* Wed Jan 13 2010 Alexander Kurtakov <akurtako at redhat.com> 0.7.2-1
+- Update to upstream 0.7.2.
+- Drop gcj_support.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

install_doc.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: install_doc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libmatthew-java/devel/install_doc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- install_doc.patch	27 Jun 2008 19:52:15 -0000	1.1
+++ install_doc.patch	13 Jan 2010 13:24:58 -0000	1.2
@@ -2,15 +2,6 @@ diff --git a/Makefile b/Makefile
 index 7607a79..4f6e728 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -39,7 +39,7 @@ DEBUG?=disable
- 
- .NOPARALLEL:
- 
--all: unix-$(UNIXVER).jar cgi-$(CGIVER).jar debug-enable-$(DEBUGVER).jar debug-disable-$(DEBUGVER).jar io-$(IOVER).jar hexdump-$(HEXVER).jar libcgi-java.so libunix-java.so
-+all: unix-$(UNIXVER).jar cgi-$(CGIVER).jar debug-enable-$(DEBUGVER).jar debug-disable-$(DEBUGVER).jar io-$(IOVER).jar hexdump-$(HEXVER).jar libcgi-java.so libunix-java.so doc
- 
- classes: .classes 
- .classes: $(SRC) 
 @@ -134,4 +134,4 @@ install-jar: unix-$(UNIXVER).jar cgi-$(CGIVER).jar debug-enable-$(DEBUGVER).jar
  	ln -sf cgi-$(CGIVER).jar $(DESTDIR)$(JARDIR)/cgi.jar
  	ln -sf hexdump-$(HEXVER).jar $(DESTDIR)$(JARDIR)/hexdump.jar


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmatthew-java/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	4 Sep 2008 20:10:03 -0000	1.3
+++ .cvsignore	13 Jan 2010 13:24:58 -0000	1.4
@@ -1 +1,2 @@
 libmatthew-java-0.7.1.tar.gz
+libmatthew-java-0.7.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmatthew-java/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	4 Sep 2008 20:10:03 -0000	1.3
+++ sources	13 Jan 2010 13:24:58 -0000	1.4
@@ -1 +1 @@
-6a4db221129f230c64a0f937d00bb703  libmatthew-java-0.7.1.tar.gz
+774e0b0b9c021acd1f2280c908865c3c  libmatthew-java-0.7.2.tar.gz


--- openjdk.patch DELETED ---


--- makefile.patch DELETED ---