rpms/ustr/devel ustr-import-multilib.patch, NONE, 1.1 ustr.spec, 1.8, 1.9
James Antill (james)
fedora-extras-commits at redhat.com
Sun Feb 10 21:56:36 UTC 2008
- Previous message (by thread): rpms/granule/F-8 .cvsignore, 1.3, 1.4 granule.spec, 1.7, 1.8 sources, 1.4, 1.5
- Next message (by thread): rpms/audacity/devel audacity-1.3.2-testing.patch, 1.2, 1.3 audacity.spec, 1.43, 1.44
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: james
Update of /cvs/pkgs/rpms/ustr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16400
Modified Files:
ustr.spec
Added Files:
ustr-import-multilib.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-multilib.patch:
--- NEW FILE ustr-import-multilib.patch ---
commit 563a3515334f69d1d071716ee99280cd221c2800
Author: James Antill <james at and.org>
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, at 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" "$@"
Index: ustr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ustr/devel/ustr.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ustr.spec 15 Jan 2008 01:29:49 -0000 1.8
+++ ustr.spec 10 Feb 2008 21:55:56 -0000 1.9
@@ -19,12 +19,13 @@
Name: ustr
Version: 1.0.3
-Release: 2%{?dist}
+Release: 3%{?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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# BuildRequires: make gcc sed
@@ -78,6 +79,8 @@
%prep
%setup -q
+%patch0 -p1
+
%build
make %{?_smp_mflags} all-shared CFLAGS="${CFLAGS:-%optflags}" %{policy_cflags}
@@ -139,6 +142,10 @@
%changelog
+* Sun Feb 10 2008 James Antill <james at fedoraproject.org> - 1.0.3-3
+- Add upstream multilib patch for ustr-import
+- Resolves: bug#343351
+
* Mon Jan 14 2008 James Antill <james at fedoraproject.org> - 1.0.3-2
- Build new upstream in Fedora
- Previous message (by thread): rpms/granule/F-8 .cvsignore, 1.3, 1.4 granule.spec, 1.7, 1.8 sources, 1.4, 1.5
- Next message (by thread): rpms/audacity/devel audacity-1.3.2-testing.patch, 1.2, 1.3 audacity.spec, 1.43, 1.44
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list