From 2908b50d27be5ac8b73f42e467a97fda4e6bee2d Mon Sep 17 00:00:00 2001
From: James Antill <james@fedoraproject.org>
Date: Thu, 6 Mar 2008 04:01:06 +0000
Subject: [PATCH] - New new upstream: 1.0.4

---
 .cvsignore |  2 +-
 sources    |  2 +-
 ustr.spec  | 49 ++++++++++++++++++++++++++++++++++++++++---------
 3 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 7f03656..ada62b5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ustr-1.0.2.tar.gz
+ustr-1.0.4.tar.gz
diff --git a/sources b/sources
index 78d441b..472edb3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-75f765c34d52c8fd46905f64ff6af7d0  ustr-1.0.2.tar.gz
+0833c29554eea19f2660aa000ba4c7b0  ustr-1.0.4.tar.gz
diff --git a/ustr.spec b/ustr.spec
index a8d3e22..ead04a9 100644
--- a/ustr.spec
+++ b/ustr.spec
@@ -1,6 +1,7 @@
 
 %define show_all_cmds       1
-%define broken_fed_dbg_opts 1
+%define broken_fed_dbg_opts 0
+%define multilib_inst       1
 
 %if %{show_all_cmds}
 %define policy_cflags_hide HIDE=
@@ -17,14 +18,22 @@
 
 %define policy_cflags %{policy_cflags_hide}  %{policy_cflags_broken}
 
+%if %{multilib_inst}
+%define ustr_make_install install-multilib-linux
+%else
+%define ustr_make_install install
+%endif
+
+
 Name: ustr
-Version: 1.0.2
-Release: 3%{?dist}
+Version: 1.0.4
+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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # BuildRequires: make gcc sed
 
@@ -77,21 +86,22 @@ Requires: %{name}-debug = %{version}-%{release}
 
 %prep
 %setup -q
+#patch0 -p1
 
 %build
 make %{?_smp_mflags} all-shared CFLAGS="${CFLAGS:-%optflags}" %{policy_cflags}
 
 %check
 %if %{?chk}%{!?chk:1}
-make check %{policy_cflags}
+make %{?_smp_mflags} check CFLAGS="${CFLAGS:-%optflags}" %{policy_cflags}
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make $@ install prefix=%{_prefix} \
+make $@ %{ustr_make_install} prefix=%{_prefix} \
                 bindir=%{_bindir}         mandir=%{_mandir} \
                 datadir=%{_datadir}       libdir=%{_libdir} \
-                includedir=%{_includedir} \
+                includedir=%{_includedir} libexecdir=%{_libexecdir} \
                 DESTDIR=$RPM_BUILD_ROOT LDCONFIG=/bin/true HIDE=
 
 %clean
@@ -114,9 +124,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_datadir}/ustr-%{version}
 %{_bindir}/ustr-import
+%if %{multilib_inst}
+%{_libexecdir}/ustr-%{version}/ustr-import*
+%endif
 %{_includedir}/ustr.h
 %{_includedir}/ustr-*.h
-%exclude %{_includedir}/ustr*debug.h
+%exclude %{_includedir}/ustr*debug*.h
 %{_libdir}/pkgconfig/ustr.pc
 %{_libdir}/libustr.so
 %{_datadir}/doc/ustr-devel-%{version}
@@ -130,8 +143,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/libustr-debug-1.0.so.*
 %{_libdir}/libustr-debug.so
-%{_includedir}/ustr-debug.h
-%{_includedir}/ustr-conf-debug.h
+%{_includedir}/ustr*debug*.h
 %{_libdir}/pkgconfig/ustr-debug.pc
 
 %files debug-static
@@ -139,6 +151,25 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
+- Preserve timestamps for shared multilib. files.
+- Relates: bug#343351
+
+* Sun Feb 10 2008 James Antill <james@fedoraproject.org> - 1.0.3-3
+- Add upstream multilib patch for ustr-import
+- Resolves: bug#343351
+
+* Mon Jan 14 2008 James Antill <james@fedoraproject.org> - 1.0.3-2
+- Build new upstream in Fedora
+
 * Tue Oct 30 2007 James Antill <james@and.org> - 1.0.2-2
 - Build new upstream in Fedora