- %prep and patch0 updated for 1.0.2

Changed files:
    jakarta-commons-daemon-link.patch -> 1.2
    java-commons-daemon.spec -> 1.30

diff --git a/jakarta-commons-daemon-link.patch b/jakarta-commons-daemon-link.patch
index 47619e6e16700343f0f1c6e8d2c7bfe07fa4d1dc..937af95cec6f93a8a0c02ed65747667718b4ac41 100644 (file)
--- a/jakarta-commons-daemon-link.patch
+++ b/jakarta-commons-daemon-link.patch
@@ -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
        $(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
  
  clean:
        rm -f $(OBJS) ../jsvc jsvc-unix.o libservice.a

diff --git a/java-commons-daemon.spec b/java-commons-daemon.spec
index 306dcdfc2144b1486d35eadfe1bd61772e70ad24..e3b65582f4a06d61bcfa49c28745c2187e1c4249 100644 (file)
--- a/java-commons-daemon.spec
+++ b/java-commons-daemon.spec
@@ -54,8 +54,8 @@ Commons Daemon documentation.
 Dokumentacja do Commons Daemon.
 
 %prep
 Dokumentacja do Commons Daemon.
 
 %prep

-%setup -qc
-mv daemon-%{version}/* .
+%setup -q -n %{srcname}-%{version}-src
+

 %patch0 -p1
 
 %build
 %patch0 -p1
 
 %build