Selaa lähdekoodia

upgrading package: libjio 0.24 -> 0.25

Ralf S. Engelschall 16 vuotta sitten
vanhempi
commit
70a8a36b8d
2 muutettua tiedostoa jossa 36 lisäystä ja 16 poistoa
  1. 14 0
      libjio/libjio.patch
  2. 22 16
      libjio/libjio.spec

+ 14 - 0
libjio/libjio.patch

@@ -0,0 +1,14 @@
+Index: libjio/trans.c
+--- libjio/trans.c.orig	2009-03-29 06:31:21 +0200
++++ libjio/trans.c	2009-03-30 21:40:55 +0200
+@@ -421,8 +421,10 @@
+ 		ts->fs->ltrans = linger;
+ 		pthread_mutex_unlock(&(ts->fs->ltlock));
+ 	} else {
++#if 0
+ 		if (fdatasync(ts->fs->fd) != 0)
+ 			goto rollback_exit;
++#endif
+ 
+ 		/* the transaction has been applied, so we cleanup and remove
+ 		 * it from the disk */

+ 22 - 16
libjio/libjio.spec

@@ -31,11 +31,12 @@ Distribution: OpenPKG Community
 Class:        EVAL
 Group:        Libraries
 License:      OSL
-Version:      0.24
-Release:      20090307
+Version:      0.25
+Release:      20090330
 
 #   list of sources
 Source0:      http://blitiri.com.ar/p/libjio/files/%{version}/libjio-%{version}.tar.gz
+Patch0:       libjio.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -66,12 +67,15 @@ AutoReqProv:  no
 
 %prep
     %setup -q
+    %patch -p0
 
 %build
-    %{l_make} %{l_mflags} \
-        CC="%{l_cc}" \
-        CFLAGS="%{l_cflags -O} -std=c99" \
-        libjio.a libjio.pc jiofsck
+    ( cd libjio
+      %{l_make} %{l_mflags} \
+          CC="%{l_cc}" \
+          CFLAGS="%{l_cflags -O} -std=c99" \
+          libjio.a libjio.pc jiofsck
+    ) || exit $?
 
 %install
     rm -rf $RPM_BUILD_ROOT
@@ -80,17 +84,19 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/include \
         $RPM_BUILD_ROOT%{l_prefix}/lib \
         $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig \
-        $RPM_BUILD_ROOT%{l_prefix}/man/man3
-    %{l_shtool} install -c -s -m 755 \
-        jiofsck $RPM_BUILD_ROOT%{l_prefix}/bin/
+        $RPM_BUILD_ROOT%{l_prefix}/man/cat3
+    ( cd libjio
+      %{l_shtool} install -c -s -m 755 \
+          jiofsck $RPM_BUILD_ROOT%{l_prefix}/bin/
+      %{l_shtool} install -c -m 644 \
+          libjio.h $RPM_BUILD_ROOT%{l_prefix}/include/
+      %{l_shtool} install -c -m 644 \
+          libjio.a $RPM_BUILD_ROOT%{l_prefix}/lib/
+      %{l_shtool} install -c -m 644 \
+          libjio.pc $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/
+    ) || exit $?
     %{l_shtool} install -c -m 644 \
-        libjio.h $RPM_BUILD_ROOT%{l_prefix}/include/
-    %{l_shtool} install -c -m 644 \
-        libjio.a $RPM_BUILD_ROOT%{l_prefix}/lib/
-    %{l_shtool} install -c -m 644 \
-        libjio.pc $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/
-    %{l_shtool} install -c -m 644 \
-        doc/libjio.3 $RPM_BUILD_ROOT%{l_prefix}/man/man3/
+        doc/libjio.rst $RPM_BUILD_ROOT%{l_prefix}/man/cat3/libjio.1
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
 
 %files -f files