rpms/ustr/devel ustr-import-multilib2.patch,1.1,1.2

James Antill (james) fedora-extras-commits at redhat.com
Sun Feb 10 22:52:36 UTC 2008


Author: james

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

Modified Files:
	ustr-import-multilib2.patch 
Log Message:
* Sun Feb 10 2008 James Antill <james at fedoraproject.org> - 1.0.3-3
- Add upstream multilib patch for ustr-import
- Resolves: bug#343351


ustr-import-multilib2.patch:

Index: ustr-import-multilib2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ustr/devel/ustr-import-multilib2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ustr-import-multilib2.patch	10 Feb 2008 22:47:02 -0000	1.1
+++ ustr-import-multilib2.patch	10 Feb 2008 22:52:24 -0000	1.2
@@ -1,14 +1,20 @@
-commit 31320e203e31e78f3114c2e09c044bfd5f96fc00
+commit 4d5d688defa0f0909fb05e1e288f9ffbbb050e7d
 Author: James Antill <james at and.org>
 Date:   Sun Feb 10 17:46:10 2008 -0500
 
-    Fix typo
+     Fix minor problems
 
 diff --git a/Makefile b/Makefile
-index 2158dff..080c7de 100644
+index 2158dff..17558cf 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -408,7 +408,7 @@ install-multilib-linux: install autoconf_64b ustr-import-multilib
+@@ -403,12 +403,13 @@ ustr-import-multilib: ustr-import-multilib.in
+ 		sed -e 's, at MBINDIR@,$(MBINDIR),g' < $< > $@
+ 
+ install-multilib-linux: install autoconf_64b ustr-import-multilib
++		install -d $(DESTDIR)$(MBINDIR)
+ 		$(HIDE)mlib=`./autoconf_64b`; \
+                    if test "x$$mlib" = "x1"; then mlib=64; else mlib=32; fi; \
                     mv -f $(DESTDIR)$(includedir)/ustr-conf-debug.h \
                           $(DESTDIR)$(includedir)/ustr-conf-debug-$$mlib.h; \
                     mv -f $(DESTDIR)$(includedir)/ustr-conf.h \




More information about the fedora-extras-commits mailing list