From 9f272f5f6039f58e243340815c45081143d498b7 Mon Sep 17 00:00:00 2001
From: James Antill <james@fedoraproject.org>
Date: Mar 06 2008 03:49:32 +0000
Subject: - New new upstream: 1.0.4


---

diff --git a/multilib-ustr-import.patch b/multilib-ustr-import.patch
deleted file mode 100644
index 4ef1384..0000000
--- a/multilib-ustr-import.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-commit 18a892b62c50fcbdaed3d92645d9457466d623a3
-Author: James Antill <james@and.org>
-Date:   Wed Mar 5 22:01:58 2008 -0500
-
-    Fixup ustr-import in multilib. ... again
-
-diff --git a/Makefile b/Makefile
-index d025d25..3a245ec 100644
---- a/Makefile
-+++ b/Makefile
-@@ -410,7 +410,7 @@ install: all-shared ustr.pc ustr-debug.pc
- 		install -pm 644 -t $(DESTDIR)$(libdir)/pkgconfig ustr.pc ustr-debug.pc
- 
- ustr-import-multilib: ustr-import-multilib.in
--		sed -e 's,@MBINDIR@,$(MBINDIR),g' < $< > $@
-+		sed -e 's,@INCLUDEDIR@,$(includedir),g' -e 's,@MBINDIR@,$(MBINDIR),g' < $< > $@
- 
- install-multilib-linux: install autoconf_64b ustr-import-multilib
- 		install -d $(DESTDIR)$(MBINDIR)
-@@ -429,7 +429,7 @@ install-multilib-linux: install autoconf_64b ustr-import-multilib
- 		$(HIDE)mv -f $(DESTDIR)$(bindir)/ustr-import-multilib $(DESTDIR)$(bindir)/ustr-import
- 		$(HIDE)touch --reference ustr-conf-multilib-linux.h $(DESTDIR)$(includedir)/ustr-conf.h
- 		$(HIDE)touch --reference ustr-conf-debug-multilib-linux.h $(DESTDIR)$(includedir)/ustr-conf-debug.h
--		$(HIDE)touch --reference ustr-import-multilib $(DESTDIR)$(bindir)/ustr-import
-+		$(HIDE)touch --reference ustr-import-multilib.in $(DESTDIR)$(bindir)/ustr-import
- 
- 
- 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
diff --git a/sources b/sources
index 1f53420..472edb3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc73e968de26e4e911d7c81c5e0e7359  ustr-1.0.4.tar.gz
+0833c29554eea19f2660aa000ba4c7b0  ustr-1.0.4.tar.gz
diff --git a/ustr.spec b/ustr.spec
index 340c96b..ead04a9 100644
--- a/ustr.spec
+++ b/ustr.spec
@@ -27,13 +27,13 @@
 
 Name: ustr
 Version: 1.0.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: String library, very low memory overhead, simple to import
 Group: System Environment/Libraries
 License: MIT or LGPLv2+ or BSD
 URL: http://www.and.org/ustr/
 Source0: http://www.and.org/ustr/%{version}/%{name}-%{version}.tar.gz
-Patch0: multilib-ustr-import.patch
+# Patch0: multilib-ustr-import.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # BuildRequires: make gcc sed
 
@@ -86,7 +86,7 @@ Requires: %{name}-debug = %{version}-%{release}
 
 %prep
 %setup -q
-%patch0 -p1
+#patch0 -p1
 
 %build
 make %{?_smp_mflags} all-shared CFLAGS="${CFLAGS:-%optflags}" %{policy_cflags}
@@ -151,12 +151,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Mar  5 2008 James Antill <james@fedoraproject.org> - 1.0.4-4
-- New upstream: 1.0.4
-- Add multilib fix for import
+* Wed Mar  5 2008 James Antill <james@fedoraproject.org> - 1.0.4-5
+- New new upstream: 1.0.4
 
 * Thu Feb 21 2008 Dennis Gilmore <dennis@ausil.us> - 1.0.3-5
 - set broken_fed_dbg_opts to 0 its the recomended option upstream
+- this works around sparc GCC problems
 - add smpflags and cflags to make check
 
 * Wed Feb 13 2008 James Antill <james@fedoraproject.org> - 1.0.3-4