rpms/ustr/devel ustr-preserve-multilib.patch, NONE, 1.1 ustr.spec, 1.13, 1.14

[James Antill (james)]

Author: james

Update of /cvs/pkgs/rpms/ustr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19623

Modified Files:
	ustr.spec 
Added Files:
	ustr-preserve-multilib.patch 
Log Message:
* Wed Feb 13 2008 James Antill <james at fedoraproject.org> - 1.0.3-4
- Preserve timestamps for shared multilib. files.
- Relates: bug#343351


ustr-preserve-multilib.patch:

--- NEW FILE ustr-preserve-multilib.patch ---
commit 0f7fb551c46ad8183781f446f58fb188aec11ce0
Author: James Antill <james at and.org>
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, at MBINDIR@,$(MBINDIR),g' < $< > $@


Index: ustr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ustr/devel/ustr.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ustr.spec	10 Feb 2008 23:16:43 -0000	1.13
+++ ustr.spec	14 Feb 2008 00:27:57 -0000	1.14
@@ -27,7 +27,7 @@
 
 Name: ustr
 Version: 1.0.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: String library, very low memory overhead, simple to import
 Group: System Environment/Libraries
 License: MIT or LGPLv2+ or BSD
@@ -35,6 +35,7 @@
 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
 
@@ -90,6 +91,7 @@
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 make %{?_smp_mflags} all-shared CFLAGS="${CFLAGS:-%optflags}" %{policy_cflags}
@@ -154,6 +156,10 @@
 
 
 %changelog
+* Wed Feb 13 2008 James Antill <james at fedoraproject.org> - 1.0.3-4
+- Preserve timestamps for shared multilib. files.
+- Relates: bug#343351
+
 * Sun Feb 10 2008 James Antill <james at fedoraproject.org> - 1.0.3-3
 - Add upstream multilib patch for ustr-import
 - Resolves: bug#343351