rpms/flexdock/F-12 flexdock.spec,1.3,1.4

[mycae]

Author: mycae

Update of /cvs/pkgs/rpms/flexdock/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17866

Modified Files:
	flexdock.spec 
Log Message:
* Fix for bug 548758



Index: flexdock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flexdock/F-12/flexdock.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- flexdock.spec	24 Jul 2009 22:53:25 -0000	1.3
+++ flexdock.spec	19 Dec 2009 09:02:26 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		flexdock
 Version:	0.5.1
-Release:	14%{?dist}
+Release:	15%{?dist}
 Summary:	Docking framework for Java Swing GUI apps
 
 Group:		Development/Libraries
@@ -55,18 +55,17 @@ Swing applications.
 %setup -qc
 
 #Modify the jni dir that is hardcoded in the patch
-cp -pf %{PATCH0} %{PATCH0}.tmp
-sed -i 's!%%{_libdir}/%%{name}/!%{_libdir}/%{name}/!' %{PATCH0}
+cp %{PATCH0} ./tmpJniPatch
+sed -i 's!%%{_libdir}/%%{name}!%{_libdir}/%{name}!' tmpJniPatch
+
 #Apply patches
-%patch0
+#Apply patch0
+patch -p 1 --fuzz=0 < tmpJniPatch
 %patch1
 %patch2
 %patch3
 %patch4
 
-#restore patch0
-mv %{PATCH0}.tmp %{PATCH0}
-
 #Override the build file's default hard-coded paths
 echo "sdk.home=%{_jvmdir}/java" > workingcopy.properties
 
@@ -160,6 +159,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 19 2009 <mycae(a!t)yahoo.com> 0.5.1-15
+- Fix patch to match sed expression
+- Don't modify jni patch in-place
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild