rpms/ustr/devel multilib-ustr-import.patch, NONE, 1.1 ustr.spec, 1.16, 1.17
James Antill (james)
fedora-extras-commits at redhat.com
Thu Mar 6 03:06:15 UTC 2008
- Previous message (by thread): rpms/ustr/devel sources,1.5,1.6
- Next message (by thread): rpms/xorg-x11-proto-devel/devel .cvsignore, 1.32, 1.33 sources, 1.30, 1.31 xorg-x11-proto-devel.spec, 1.69, 1.70 inputproto-1.4.2-card32.patch, 1.1, NONE
- 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-serv2709
Modified Files:
ustr.spec
Added Files:
multilib-ustr-import.patch
Log Message:
* Wed Mar 5 2008 James Antill <james at fedoraproject.org> - 1.0.4-3
- New upstream: 1.0.4
- Add multilib fix for import
multilib-ustr-import.patch:
--- NEW FILE multilib-ustr-import.patch ---
commit bbe10c2b49f0a05b0ecebb1874a19c9b3655a1b3
Author: James Antill <james at 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, at MBINDIR@,$(MBINDIR),g' < $< > $@
+ sed -e 's, at INCLUDEDIR@,$(includedir),g' -e 's, at 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:
Index: ustr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ustr/devel/ustr.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ustr.spec 6 Mar 2008 02:10:10 -0000 1.16
+++ ustr.spec 6 Mar 2008 03:05:40 -0000 1.17
@@ -27,12 +27,13 @@
Name: ustr
Version: 1.0.4
-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: multilib-ustr-import.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# BuildRequires: make gcc sed
@@ -85,6 +86,7 @@
%prep
%setup -q
+%patch0 -p1
%build
make %{?_smp_mflags} all-shared CFLAGS="${CFLAGS:-%optflags}" %{policy_cflags}
@@ -149,8 +151,9 @@
%changelog
-* Wed Mar 5 2008 James Antill <james at fedoraproject.org> - 1.0.4-2
+* Wed Mar 5 2008 James Antill <james at fedoraproject.org> - 1.0.4-3
- New upstream: 1.0.4
+- Add multilib fix for import
* Thu Feb 21 2008 Dennis Gilmore <dennis at ausil.us> - 1.0.3-5
- set broken_fed_dbg_opts to 0 its the recomended option upstream
- Previous message (by thread): rpms/ustr/devel sources,1.5,1.6
- Next message (by thread): rpms/xorg-x11-proto-devel/devel .cvsignore, 1.32, 1.33 sources, 1.30, 1.31 xorg-x11-proto-devel.spec, 1.69, 1.70 inputproto-1.4.2-card32.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list