packages: java-commons-daemon/jakarta-commons-daemon-link.patch, java-commo...

[pawelz]

Author: pawelz                       Date: Tue May 18 22:16:13 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- %prep and patch0 updated for 1.0.2

---- Files affected:
packages/java-commons-daemon:
   jakarta-commons-daemon-link.patch (1.1 -> 1.2) , java-commons-daemon.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: packages/java-commons-daemon/jakarta-commons-daemon-link.patch
diff -u packages/java-commons-daemon/jakarta-commons-daemon-link.patch:1.1 packages/java-commons-daemon/jakarta-commons-daemon-link.patch:1.2
--- packages/java-commons-daemon/jakarta-commons-daemon-link.patch:1.1	Sat Aug 25 20:43:25 2007
+++ packages/java-commons-daemon/jakarta-commons-daemon-link.patch	Wed May 19 00:16:07 2010
@@ -1,11 +1,11 @@
---- daemon-1.0.1/src/native/unix/native/Makefile.in.orig	2005-04-18 04:32:38.000000000 +0200
-+++ daemon-1.0.1/src/native/unix/native/Makefile.in	2007-08-25 19:30:50.624383935 +0200
-@@ -36,7 +36,7 @@
+--- commons-daemon-1.0.2-src/src/native/unix/native/Makefile.in.orig	2010-02-13 17:58:21.000000000 +0100
++++ commons-daemon-1.0.2-src/src/native/unix/native/Makefile.in	2010-05-19 00:10:44.000000000 +0200
+@@ -38,7 +38,7 @@
  	$(RANLIB) libservice.a
  
  jsvc: jsvc-unix.o libservice.a
--	$(LDCMD) $(LDFLAGS) jsvc-unix.o libservice.a -o ../jsvc
-+	$(LDCMD) jsvc-unix.o libservice.a $(LDFLAGS) -o ../jsvc
+-	$(LDCMD) $(LDFLAGS) jsvc-unix.o libservice.a $(LIBS) -o ../jsvc
++	$(LDCMD) jsvc-unix.o libservice.a $(LIBS) $(LDFLAGS) -o ../jsvc
  
  clean:
  	rm -f $(OBJS) ../jsvc jsvc-unix.o libservice.a

================================================================
Index: packages/java-commons-daemon/java-commons-daemon.spec
diff -u packages/java-commons-daemon/java-commons-daemon.spec:1.29 packages/java-commons-daemon/java-commons-daemon.spec:1.30
--- packages/java-commons-daemon/java-commons-daemon.spec:1.29	Wed May 19 00:07:51 2010
+++ packages/java-commons-daemon/java-commons-daemon.spec	Wed May 19 00:16:07 2010
@@ -55,8 +55,8 @@
 Dokumentacja do Commons Daemon.
 
 %prep
-%setup -qc
-mv daemon-%{version}/* .
+%setup -q -n %{srcname}-%{version}-src
+
 %patch0 -p1
 
 %build
@@ -119,6 +119,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2010/05/18 22:16:07  pawelz
+- %prep and patch0 updated for 1.0.2
+
 Revision 1.29  2010/05/18 22:07:51  pawelz
 - up to 1.0.2
 - updated deps
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-daemon/jakarta-commons-daemon-link.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-daemon/java-commons-daemon.spec?r1=1.29&r2=1.30&f=u