rpms/libmatthew-java/devel jpackage_compliance.patch, 1.2, 1.3 libmatthew-java.spec, 1.2, 1.3 makefile.patch, 1.1, 1.2
Omair Majid
omajid at fedoraproject.org
Thu Aug 28 19:48:15 UTC 2008
Author: omajid
Update of /cvs/pkgs/rpms/libmatthew-java/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18397
Modified Files:
jpackage_compliance.patch libmatthew-java.spec makefile.patch
Log Message:
* Thu Aug 28 2008 Omair Majid <omajid at redhat.com> 0.7.1-3
- Created new patches that dont cause fuzz when patching.
jpackage_compliance.patch:
Index: jpackage_compliance.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libmatthew-java/devel/jpackage_compliance.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jpackage_compliance.patch 2 Jul 2008 15:32:55 -0000 1.2
+++ jpackage_compliance.patch 28 Aug 2008 19:47:44 -0000 1.3
@@ -20,7 +20,7 @@
-LIBDIR?=$(PREFIX)/lib/jni
+LIBDIR?=$(PREFIX)/lib/libmatthew-java
- MATTVER=0.7
+ MATTVER=0.7.1
DEBUGVER=1.1
diff --git a/cx/ath/matthew/cgi/CGI.java b/cx/ath/matthew/cgi/CGI.java
index 5f1ee6a..c7291a2 100644
Index: libmatthew-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmatthew-java/devel/libmatthew-java.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libmatthew-java.spec 2 Jul 2008 15:32:55 -0000 1.2
+++ libmatthew-java.spec 28 Aug 2008 19:47:44 -0000 1.3
@@ -2,7 +2,7 @@
Name: libmatthew-java
Version: 0.7.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A few useful Java libraries
Group: Development/Libraries
License: LGPLv2
@@ -76,7 +76,7 @@
# this patch adds a system dependent path, so we fix it before
# applying the patch
-sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH2} | patch -p1
+sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH2} | patch -p1
%patch3 -p1
%patch4 -p1
@@ -142,6 +142,9 @@
%changelog
+* Thu Aug 28 2008 Omair Majid <omajid at redhat.com> 0.7.1-3
+- Created new patches that dont cause fuzz when patching.
+
* Wed Jul 2 2008 Omair Majid <omajid at redhat.com> 0.7.1-2
- Fixed hardcoded paths for jni libraries
makefile.patch:
Index: makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libmatthew-java/devel/makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- makefile.patch 27 Jun 2008 19:52:15 -0000 1.1
+++ makefile.patch 28 Aug 2008 19:47:44 -0000 1.2
@@ -1,8 +1,6 @@
---- a/Makefile
-+++ b/Makefile
-index 66b303d..67fd151 100644
-@@ -3,23 +3,26 @@ JAVADOC?=javadoc
- JAR?=jar
+--- a/Makefile.orig 2008-08-28 14:37:49.000000000 -0400
++++ b/Makefile 2008-08-28 14:45:11.000000000 -0400
+@@ -4,11 +4,14 @@
JAVAH?=javah
GCJ?=gcj
CC?=gcc
@@ -11,32 +9,30 @@
-CFLAGS+=-fpic -Wall -Os -pedantic -std=c99 -Werror
-GCJFLAGS+=-fjni
-#JCFLAGS+=-source 5.0
-+LD?=gcc
++LD=gcc
+JPPFLAGS+=-C -P
+CFLAGS+=-Wall -Os -pedantic -Werror
-+CSTD?=-std=c99
-+CSHAREFLAG+=-fpic
-+GCJJNIFLAG=-fjni
-+#JVERCFLAGS+=-source 5.0
++CSTDFLAGS?=-std=c99
++CSHAREFLAGS+=-fpic
++GCJJNIFLAGS+=-fjni
++#JVERFLAGS+=-source 5.0
+JCFLAGS+=
INCLUDES+=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
JAVADOCFLAGS?=-quiet -author -link http://java.sun.com/j2se/1.4.2/docs/api/
- LDVER?=$(shell ld -v | cut -d' ' -f1)
+@@ -16,9 +19,9 @@
UNAME?=$(shell uname -s)
ifeq ($(LDVER),GNU)
-LDFLAGS+=-fpic -shared -lc
-+LDSHAREFLAGS+=-fpic -shared
++LDSHAREFLAGS+=-fpic -shared -lc
else
-LDFLAGS+=-lc
+LDSHAREFLAGS+=-lc
endif
PREFIX?=/usr
- JARDIR?=$(PREFIX)/lib/libmatthew-java
-@@ -44,9 +47,9 @@ all: unix-$(UNIXVER).jar cgi-$(CGIVER).jar debug-enable-$(DEBUGVER).jar debug-di
- classes: .classes
+@@ -45,7 +48,7 @@
.classes: $(SRC)
mkdir -p classes
$(MAKE) .$(DEBUG)debug
@@ -45,17 +41,15 @@
touch .classes
clean:
rm -rf classes doc
- rm -f .classes .enabledebug .disabledebug *.o *.h *.so *.tar.gz *.jar *.cgi Manifest
-@@ -63,18 +66,18 @@ unix-$(UNIXVER).jar: .classes
- hexdump-$(HEXVER).jar: .classes
+@@ -69,16 +72,16 @@
(cd classes; $(JAR) cf ../$@ cx/ath/matthew/utils/Hexdump.class)
%.o: %.c %.h
- $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-+ $(CC) $(CFLAGS) $(CSTD) $(CSHAREFLAG) $(INCLUDES) -c -o $@ $<
++ $(CC) $(CSTDFLAGS) $(CSHAREFLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $<
lib%.so: %.o
- $(LD) $(LDFLAGS) -o $@ $<
-+ $(CC) $(LDFLAGS) $(LDSHAREFLAGS) -o $@ $<
++ $(LD) $(LDSHAREFLAGS) $(LDFLAGS) -o $@ $<
unix-java.h: .classes
$(JAVAH) -classpath classes -o $@ cx.ath.matthew.unix.UnixServerSocket cx.ath.matthew.unix.UnixSocket cx.ath.matthew.unix.USInputStream cx.ath.matthew.unix.USOutputStream
cgi-java.h: .classes
@@ -63,19 +57,17 @@
test.cgi: cgi-$(CGIVER).jar libcgi-java.so
- $(GCJ) $(GCJFLAGS) -L. -lcgi-java -o test.cgi --main=cx.ath.matthew.cgi.testcgi cgi-$(CGIVER).jar
-+ $(GCJ) $(GCJFLAGS) $(GCJJNIFLAG) -L. -lcgi-java -o test.cgi --main=cx.ath.matthew.cgi.testcgi cgi-$(CGIVER).jar
++ $(GCJ) $(GCJJNIFLAG) $(GCJFLAGS) -L. -lcgi-java -o test.cgi --main=cx.ath.matthew.cgi.testcgi cgi-$(CGIVER).jar
libmatthew-java-$(MATTVER).tar.gz: Makefile cx cgi-java.c unix-java.c README INSTALL COPYING changelog
mkdir -p libmatthew-java-$(MATTVER)
- cp -a $^ libmatthew-java-$(MATTVER)
-@@ -87,16 +90,16 @@ debug-disable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp
- make .disabledebug
+@@ -97,14 +100,14 @@
(cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class)
.enabledebug: cx/ath/matthew/debug/Debug.jpp
mkdir -p classes
- cpp $(PPFLAGS) -DDEBUGSETTING=true < cx/ath/matthew/debug/Debug.jpp > cx/ath/matthew/debug/Debug.java
- $(JAVAC) $(JCFLAGS) -cp classes -d classes cx/ath/matthew/debug/Debug.java cx/ath/matthew/utils/Hexdump.java
-+ cpp $(PPFLAGS) $(JPPFLAGS) -DDEBUGSETTING=true < cx/ath/matthew/debug/Debug.jpp > cx/ath/matthew/debug/Debug.java
++ cpp $(JPPFLAGS) $(PPFLAGS) -DDEBUGSETTING=true < cx/ath/matthew/debug/Debug.jpp > cx/ath/matthew/debug/Debug.java
+ $(JAVAC) $(JVERCFLAGS) $(JCFLAGS) -cp classes -d classes cx/ath/matthew/debug/Debug.java cx/ath/matthew/utils/Hexdump.java
rm -f .disabledebug
touch .enabledebug
@@ -83,10 +75,8 @@
mkdir -p classes
- cpp $(PPFLAGS) -DDEBUGSETTING=false < cx/ath/matthew/debug/Debug.jpp > cx/ath/matthew/debug/Debug.java
- $(JAVAC) $(JCFLAGS) -cp classes -d classes cx/ath/matthew/debug/Debug.java cx/ath/matthew/utils/Hexdump.java
-+ cpp $(PPFLAGS) $(JPPFLAGS) -DDEBUGSETTING=false < cx/ath/matthew/debug/Debug.jpp > cx/ath/matthew/debug/Debug.java
-+ $(JAVAC) $(JVERCFLAGS) $(JCFLAGS) -cp classes -d classes cx/ath/matthew/debug/Debug.java cx/ath/matthew/utils/Hexdump.java
++ cpp $(JPPFLAGS) $(PPFLAGS) -DDEBUGSETTING=false < cx/ath/matthew/debug/Debug.jpp > cx/ath/matthew/debug/Debug.java
++ $(JAVAC) $(JVERFLAGS) $(JCFLAGS) -cp classes -d classes cx/ath/matthew/debug/Debug.java cx/ath/matthew/utils/Hexdump.java
rm -f .enabledebug
touch .disabledebug
cx/ath/matthew/debug/Debug.java: .disabledebug
- doc/index.html:
-
More information about the fedora-extras-commits
mailing list