From 7e1d1cfbabd64c3ec0a9242b7e2ff740b871fd5b Mon Sep 17 00:00:00 2001 From: James Antill Date: Mar 06 2008 02:20:14 +0000 Subject: - New upstream: 1.0.4 --- diff --git a/.cvsignore b/.cvsignore index ae0d3ad..ada62b5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -ustr-1.0.2.tar.gz -ustr-1.0.3.tar.gz +ustr-1.0.4.tar.gz diff --git a/sources b/sources index 93ef7c3..1f53420 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0061c50cd3d60a36218fa6df1fe32ec7 ustr-1.0.4.tar.gz +fc73e968de26e4e911d7c81c5e0e7359 ustr-1.0.4.tar.gz diff --git a/ustr-import-multilib.patch b/ustr-import-multilib.patch deleted file mode 100644 index 3698755..0000000 --- a/ustr-import-multilib.patch +++ /dev/null @@ -1,70 +0,0 @@ -commit 563a3515334f69d1d071716ee99280cd221c2800 -Author: James Antill -Date: Sun Feb 10 16:52:04 2008 -0500 - - Make ustr-import multilib. aware - -diff --git a/Makefile b/Makefile -index d2f9a16..2158dff 100644 ---- a/Makefile -+++ b/Makefile -@@ -12,12 +12,14 @@ DESTDIR = - prefix=/usr - datadir=$(prefix)/share - libdir=$(prefix)/lib -+libexecdir=$(prefix)/libexec - bindir=$(prefix)/bin - includedir=$(prefix)/include - SHRDIR=$(datadir)/ustr-$(VERS_FULL) - DOCSHRDIR=$(datadir)/doc/ustr-devel-$(VERS_FULL) --EXAMDIR=$(datadir)/ustr-$(VERS_FULL)/examples -+EXAMDIR=$(SHRDIR)/examples - mandir=$(datadir)/doc/man -+MBINDIR=$(libexecdir)/ustr-$(VERS_FULL) - - ############################################################################### - # This is here to work around the "Fedora build system requirement" that a big -@@ -397,16 +399,23 @@ install: all-shared ustr.pc ustr-debug.pc - install -m 755 -t $(DESTDIR)$(bindir) ustr-import - install -m 644 -t $(DESTDIR)$(libdir)/pkgconfig ustr.pc ustr-debug.pc - --install-multilib-linux: install autoconf_64b -- install -m 644 -t $(DESTDIR)$(includedir) $(SRC_HDRS_MULTI_LIB) -+ustr-import-multilib: ustr-import-multilib.in -+ sed -e 's,@MBINDIR@,$(MBINDIR),g' < $< > $@ -+ -+install-multilib-linux: install autoconf_64b ustr-import-multilib - $(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 \ - $(DESTDIR)$(includedir)/ustr-conf-$$mlib.h -+ mv -f $(DESTDIR)$(bindir)/ustr-import \ -+ $(DESTDIR)$(MBINDIR)/ustr-import-$$mlib -+ install -m 644 -t $(DESTDIR)$(includedir) $(SRC_HDRS_MULTI_LIB) - $(HIDE)mv -f $(DESTDIR)$(includedir)/ustr-conf-debug-multilib-linux.h $(DESTDIR)$(includedir)/ustr-conf-debug.h - $(HIDE)mv -f $(DESTDIR)$(includedir)/ustr-conf-multilib-linux.h $(DESTDIR)$(includedir)/ustr-conf.h -+ install -m 755 -t $(DESTDIR)$(bindir) ustr-import-multilib -+ $(HIDE)mv -f $(DESTDIR)$(bindir)/ustr-import-multilib $(DESTDIR)$(bindir)/ustr-import - - - clean: -diff --git a/ustr-import-multilib.in b/ustr-import-multilib.in -new file mode 100644 -index 0000000..2998230 ---- /dev/null -+++ b/ustr-import-multilib.in -@@ -0,0 +1,12 @@ -+#! /bin/sh -e -+ -+MBINDIR=@MBINDIR@ -+ -+one=64 -+two=32 -+ -+if [ -f "$MBINDIR/ustr-import-$one" ]; then -+ exec "$MBINDIR/ustr-import-$one" "$@" -+fi -+ -+exec "$MBINDIR/ustr-import-$two" "$@" diff --git a/ustr-import-multilib2.patch b/ustr-import-multilib2.patch deleted file mode 100644 index 48e3523..0000000 --- a/ustr-import-multilib2.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 95d99aa5fe596bd3c06aee7dfec69d8c88d2827e -Author: James Antill -Date: Sun Feb 10 17:46:10 2008 -0500 - - Fix minor problems - -diff --git a/Makefile b/Makefile -index 2158dff..ca0478a 100644 ---- a/Makefile -+++ b/Makefile -@@ -403,12 +403,13 @@ ustr-import-multilib: ustr-import-multilib.in - sed -e 's,@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 \ -- $(DESTDIR)$(includedir)/ustr-conf-$$mlib.h -+ $(DESTDIR)$(includedir)/ustr-conf-$$mlib.h; \ - mv -f $(DESTDIR)$(bindir)/ustr-import \ - $(DESTDIR)$(MBINDIR)/ustr-import-$$mlib - install -m 644 -t $(DESTDIR)$(includedir) $(SRC_HDRS_MULTI_LIB) diff --git a/ustr-preserve-multilib.patch b/ustr-preserve-multilib.patch deleted file mode 100644 index aa379cd..0000000 --- a/ustr-preserve-multilib.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit 0f7fb551c46ad8183781f446f58fb188aec11ce0 -Author: James Antill -Date: Wed Feb 13 19:25:24 2008 -0500 - - Preserve timestamps of non-generated files, helps multilib. - -diff --git a/Makefile b/Makefile -index ca0478a..beb36c8 100644 ---- a/Makefile -+++ b/Makefile -@@ -389,15 +389,15 @@ install: all-shared ustr.pc ustr-debug.pc - -rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV) - ln -s $(DBG_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV) - $(LDCONFIG) -n $(DESTDIR)$(libdir) -- install -m 644 -t $(DESTDIR)$(includedir) $(SRC_HDRS) -- install -m 644 -t $(DESTDIR)$(SHRDIR) $(SRC_SRCS) -- install -m 644 -t $(DESTDIR)$(SHRDIR) $(XSRC_SRCS) -- install -m 644 -t $(DESTDIR)$(DOCSHRDIR) $(DOCS) -- install -m 644 -t $(DESTDIR)$(EXAMDIR) $(EXAMPLES) -- install -m 644 -t $(DESTDIR)$(mandir)/man1 $(MAN_PAGES_1) -- install -m 644 -t $(DESTDIR)$(mandir)/man3 $(MAN_PAGES_3) -+ install -pm 644 -t $(DESTDIR)$(includedir) $(SRC_HDRS) -+ install -pm 644 -t $(DESTDIR)$(SHRDIR) $(SRC_SRCS) -+ install -pm 644 -t $(DESTDIR)$(SHRDIR) $(XSRC_SRCS) -+ install -pm 644 -t $(DESTDIR)$(DOCSHRDIR) $(DOCS) -+ install -pm 644 -t $(DESTDIR)$(EXAMDIR) $(EXAMPLES) -+ install -pm 644 -t $(DESTDIR)$(mandir)/man1 $(MAN_PAGES_1) -+ install -pm 644 -t $(DESTDIR)$(mandir)/man3 $(MAN_PAGES_3) - install -m 755 -t $(DESTDIR)$(bindir) ustr-import -- install -m 644 -t $(DESTDIR)$(libdir)/pkgconfig 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' < $< > $@ diff --git a/ustr.spec b/ustr.spec index 6677609..f0a05bc 100644 --- a/ustr.spec +++ b/ustr.spec @@ -26,16 +26,13 @@ Name: ustr -Version: 1.0.3 -Release: 5%{?dist} +Version: 1.0.4 +Release: 2%{?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: ustr-import-multilib.patch -Patch1: ustr-import-multilib2.patch -Patch2: ustr-preserve-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: make gcc sed @@ -89,10 +86,6 @@ Requires: %{name}-debug = %{version}-%{release} %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 - %build make %{?_smp_mflags} all-shared CFLAGS="${CFLAGS:-%optflags}" %{policy_cflags} @@ -156,6 +149,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Mar 5 2008 James Antill - 1.0.4-2 +- New upstream: 1.0.4 + * Thu Feb 21 2008 Dennis Gilmore - 1.0.3-5 - set broken_fed_dbg_opts to 0 its the recomended option upstream - add smpflags and cflags to make check