rpms/exiv2/devel exiv2-0.20-deps.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 exiv2.spec, 1.28, 1.29 sources, 1.14, 1.15 exiv2-0.18-deps.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/exiv2/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20978

Modified Files:
	.cvsignore exiv2.spec sources 
Added Files:
	exiv2-0.20-deps.patch 
Removed Files:
	exiv2-0.18-deps.patch 
Log Message:
* Sun May 30 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.20-1
- exiv2-0.20


exiv2-0.20-deps.patch:
 src/Makefile        |    8 ++++++++
 xmpsdk/src/Makefile |    4 ++++
 2 files changed, 12 insertions(+)

--- NEW FILE exiv2-0.20-deps.patch ---
diff -up exiv2-0.20/src/Makefile.deps exiv2-0.20/src/Makefile
--- exiv2-0.20/src/Makefile.deps	2010-05-25 10:25:02.000000000 -0500
+++ exiv2-0.20/src/Makefile	2010-05-30 13:33:38.181957187 -0500
@@ -195,11 +195,19 @@ $(CCOBJ): %.o: %.cpp
 	@$(LIBTOOL) --mode=compile $(COMPILE.cc) -DEXV_BUILDING_LIB=1 -o $@ $<
 	@$(MAKEDEPEND)
 	@$(POSTDEPEND)
+# The dependancies here are wrong.  It generates .lo output,
+# so things are rebuilt *every* time 'make' is called.
+# Let's try a quick-n-dirty hack -- Rex
+	touch $@
 
 $(COBJ): %.o: %.c
 	@$(LIBTOOL) --mode=compile $(COMPILE.c) -DEXV_BUILDING_LIB=1 -o $@ $<
 	@$(MAKEDEPEND)
 	@$(POSTDEPEND)
+# The dependancies here are wrong.  It generates .lo output,
+# so things are rebuilt *every* time 'make' is called.
+# Let's try a quick-n-dirty hack -- Rex
+	touch $@
 
 $(sort $(BINOBJ) $(EXIV2OBJ) $(MCOBJ) path-test.o): %.o: %.cpp
 	$(COMPILE.cc) -o $@ $<
diff -up exiv2-0.20/xmpsdk/src/Makefile.deps exiv2-0.20/xmpsdk/src/Makefile
--- exiv2-0.20/xmpsdk/src/Makefile.deps	2010-04-03 02:53:30.000000000 -0500
+++ exiv2-0.20/xmpsdk/src/Makefile	2010-05-30 13:36:16.004947131 -0500
@@ -108,6 +108,10 @@ $(CCOBJ): %.o: %.cpp
 	@$(LIBTOOL) --mode=compile $(COMPILE.cc) -o $@ $<
 	@$(MAKEDEPEND)
 	@$(POSTDEPEND)
+	# The dependancies here are wrong.  It generates .lo output,
+	# so things are rebuilt *every* time 'make' is called.
+	# Let's try a quick-n-dirty hack -- Rex
+	@touch $@
 
 %.ii: %.cpp
 	set -e; \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/exiv2/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	4 Jan 2010 15:19:43 -0000	1.14
+++ .cvsignore	31 May 2010 11:06:36 -0000	1.15
@@ -1 +1 @@
-exiv2-0.19.tar.gz
+exiv2-0.20.tar.gz


Index: exiv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exiv2/devel/exiv2.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- exiv2.spec	4 Jan 2010 15:19:44 -0000	1.28
+++ exiv2.spec	31 May 2010 11:06:36 -0000	1.29
@@ -1,7 +1,7 @@
 
 Summary: Exif and Iptc metadata manipulation library
 Name:	 exiv2
-Version: 0.19
+Version: 0.20
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -18,7 +18,7 @@ BuildRequires: zlib-devel
 # docs
 #BuildRequires: doxygen graphviz libxslt
 
-Patch1: exiv2-0.18-deps.patch
+Patch1: exiv2-0.20-deps.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -59,10 +59,6 @@ methods for Exif thumbnails, classes to 
 
 mkdir doc/html
 
-%if "%{_libdir}" != "/usr/lib"
-sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
-%endif
-
 
 %build
 %configure \
@@ -79,17 +75,22 @@ make install DESTDIR=%{buildroot}
 
 %find_lang exiv2
 
-# Unpackaged files
+## Unpackaged files
 rm -f %{buildroot}%{_libdir}/lib*.la
 
-# fix perms on installed lib
+## fix perms on installed lib
 chmod 755 %{buildroot}%{_libdir}/lib*.so*
 
-# nuke rpaths
-chrpath --list   %{buildroot}%{_bindir}/exiv2
+## nuke rpaths
+chrpath --list   %{buildroot}%{_bindir}/exiv2 && \
 chrpath --delete %{buildroot}%{_bindir}/exiv2
 
 
+%check
+export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
+test "$(pkg-config --modversion exiv2)" = "%{version}"
+
+
 %clean
 rm -rf %{buildroot} 
 
@@ -107,7 +108,7 @@ rm -rf %{buildroot} 
 
 %files libs -f exiv2.lang
 %defattr(-,root,root,-)
-%{_libdir}/libexiv2.so.6*
+%{_libdir}/libexiv2.so.9*
 
 %files devel
 %defattr(-,root,root,-)
@@ -118,6 +119,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Sun May 30 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.20-1
+- exiv2-0.20
+
 * Wed Dec 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.19-1
 - exiv2-0.19 (#552275)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/exiv2/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	4 Jan 2010 15:19:44 -0000	1.14
+++ sources	31 May 2010 11:06:36 -0000	1.15
@@ -1 +1 @@
-f52fb75a2cb7512f1484deab76473e13  exiv2-0.19.tar.gz
+3173d08a4313dc94b7bd1b7cdbda2093  exiv2-0.20.tar.gz


--- exiv2-0.18-deps.patch DELETED ---