rpms/ustr/devel multilib-ustr-import.patch, 1.1, 1.2 ustr.spec, 1.17, 1.18

James Antill (james) fedora-extras-commits at redhat.com
Thu Mar 6 03:31:45 UTC 2008


Author: james

Update of /cvs/pkgs/rpms/ustr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3262

Modified Files:
	multilib-ustr-import.patch ustr.spec 
Log Message:
* Wed Mar  5 2008 James Antill <james at fedoraproject.org> - 1.0.4-4
- New upstream: 1.0.4
- Add multilib fix for import


multilib-ustr-import.patch:

Index: multilib-ustr-import.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ustr/devel/multilib-ustr-import.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multilib-ustr-import.patch	6 Mar 2008 03:05:40 -0000	1.1
+++ multilib-ustr-import.patch	6 Mar 2008 03:31:41 -0000	1.2
@@ -1,4 +1,4 @@
-commit bbe10c2b49f0a05b0ecebb1874a19c9b3655a1b3
+commit 18a892b62c50fcbdaed3d92645d9457466d623a3
 Author: James Antill <james at and.org>
 Date:   Wed Mar 5 22:01:58 2008 -0500
 
@@ -26,3 +26,87 @@
  
  
  clean:
+diff --git a/ustr-import-multilib.in b/ustr-import-multilib.in
+index b1f9994..0656b2a 100644
+--- a/ustr-import-multilib.in
++++ b/ustr-import-multilib.in
+@@ -3,30 +3,59 @@
+ INCDIR=@INCLUDEDIR@
+ MBINDIR=@MBINDIR@
+ 
++NOT_DONE=1
+ inst32()
+ {
++  foo=no
++  if [ "x$1" = "xeither" ]; then
++    foo=either
++    shift
++  fi
+   if [ -f "$MBINDIR/ustr-import-32" ]; then
+     "$MBINDIR/ustr-import-32" "$@"
+-  
++    RETVAL=$?
++  fi
++
++  if [ "x$foo" = "xeither" ]; then
+     # This assume an installed multilib ustr-conf.h
+-    [ $RETVAL -eq 0 ] && mv ustr-conf.h ustr-conf-32.h
+-    [ $RETVAL -eq 0 ] && cp "$INCDIR/ustr-conf.h" .
+-    [ $RETVAL -eq 0 ] && mv ustr-conf-debug.h ustr-conf-debug-32.h
+-    [ $RETVAL -eq 0 ] && cp "$INCDIR/ustr-conf-debug.h" .
++    if [ $RETVAL -eq 0 ] && [ -f ustr-conf.h ]; then
++        mv ustr-conf.h ustr-conf-32.h
++        cp "$INCDIR/ustr-conf.h" .
++    fi
++    if [ $RETVAL -eq 0 ] && [ -f ustr-conf-debug.h ]; then
++        mv ustr-conf-debug.h ustr-conf-debug-32.h
++        cp "$INCDIR/ustr-conf-debug.h" .
++    fi
++    NOT_DONE=0
++  else
+     exit $RETVAL
+   fi
+ }
+ 
+ inst64()
+ {
++  foo=no
++  if [ "x$1" = "xeither" ]; then
++    foo=either
++    shift
++  fi
+   if [ -f "$MBINDIR/ustr-import-64" ]; then
+     "$MBINDIR/ustr-import-64" "$@"
+     RETVAL=$?
++  fi
++
++  if [ "x$foo" = "xeither" ]; then
+     # This assume an installed multilib ustr-conf.h
+-    [ $RETVAL -eq 0 ] && mv ustr-conf.h ustr-conf-64.h
+-    [ $RETVAL -eq 0 ] && cp "$INCDIR/ustr-conf.h" .
+-    [ $RETVAL -eq 0 ] && mv ustr-conf-debug.h ustr-conf-debug-64.h
+-    [ $RETVAL -eq 0 ] && cp "$INCDIR/ustr-conf-debug.h" .
++    if [ $RETVAL -eq 0 ] && [ -f ustr-conf.h ]; then
++        mv ustr-conf.h ustr-conf-64.h
++        cp "$INCDIR/ustr-conf.h" .
++    fi
++    if [ $RETVAL -eq 0 ] && [ -f ustr-conf-debug.h ]; then
++        mv ustr-conf-debug.h ustr-conf-debug-64.h
++        cp "$INCDIR/ustr-conf-debug.h" .
++    fi
++    NOT_DONE=0
++  else
+     exit $RETVAL
+   fi
+ }
+@@ -41,7 +70,7 @@ if [ "x$1" = "x--64" ]; then
+   inst64 $@
+ fi
+ 
+-inst64 $@
+-inst32 $@
++inst64 either $@
++inst32 either $@
+ 
+-exit 1
++exit $NOT_DONE


Index: ustr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ustr/devel/ustr.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ustr.spec	6 Mar 2008 03:05:40 -0000	1.17
+++ ustr.spec	6 Mar 2008 03:31:41 -0000	1.18
@@ -27,7 +27,7 @@
 
 Name: ustr
 Version: 1.0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: String library, very low memory overhead, simple to import
 Group: System Environment/Libraries
 License: MIT or LGPLv2+ or BSD
@@ -151,7 +151,7 @@
 
 
 %changelog
-* Wed Mar  5 2008 James Antill <james at fedoraproject.org> - 1.0.4-3
+* Wed Mar  5 2008 James Antill <james at fedoraproject.org> - 1.0.4-4
 - New upstream: 1.0.4
 - Add multilib fix for import
 




More information about the fedora-extras-commits mailing list