From 9840dbfbef2ac7727d87a578a2862b8dee9bf7b9d56e0070c7d62bf632d3e129 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 25 Apr 2010 18:39:53 +0000 Subject: [PATCH 1/6] remove the main library .la files OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=28 --- libgphoto2.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libgphoto2.spec b/libgphoto2.spec index c2dfb10..106996d 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -121,6 +121,10 @@ mv doc/doxygen-output/libgphoto2-api.html apidocs fn=$RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libgphoto2_port.pc grep -v driverdir= $fn > $fn.new mv $fn.new $fn +# These two should not be required, but the driver .la can stay +rm $RPM_BUILD_ROOT/%{_libdir}/libgphoto2.la +rm $RPM_BUILD_ROOT/%{_libdir}/libgphoto2_Port.la + %fdupes $RPM_BUILD_ROOT %clean From 85ff8de09288b333231d28e0ac98616f3932517a17a9bf08e9be21e978e01048 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 25 Apr 2010 19:12:27 +0000 Subject: [PATCH 2/6] P->p OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=29 --- libgphoto2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libgphoto2.spec b/libgphoto2.spec index 106996d..3419bcf 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -123,7 +123,7 @@ grep -v driverdir= $fn > $fn.new mv $fn.new $fn # These two should not be required, but the driver .la can stay rm $RPM_BUILD_ROOT/%{_libdir}/libgphoto2.la -rm $RPM_BUILD_ROOT/%{_libdir}/libgphoto2_Port.la +rm $RPM_BUILD_ROOT/%{_libdir}/libgphoto2_port.la %fdupes $RPM_BUILD_ROOT From 908b4149f750e843d7220aa808762ccd0ece2a9e13fda705a8b27663fbd80b60 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 26 Apr 2010 10:08:22 +0000 Subject: [PATCH 3/6] -la OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=30 --- libgphoto2.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/libgphoto2.spec b/libgphoto2.spec index 3419bcf..c7f2de0 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -157,9 +157,7 @@ rm -rf $RPM_BUILD_ROOT %{prefix}/bin/gphoto2-config %{prefix}/bin/gphoto2-port-config %{_libdir}/libgphoto2.so -%{_libdir}/libgphoto2.la %{_libdir}/libgphoto2_port.so -%{_libdir}/libgphoto2_port.la %{_libdir}/pkgconfig/libgphoto2.pc %{_libdir}/pkgconfig/libgphoto2_port.pc From 1b3333dd8887acfccc9549c3de861570aab9509dccab3ea6d6979dba6e7185e7 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 27 Apr 2010 07:17:04 +0000 Subject: [PATCH 4/6] - remove the major .la files OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=31 --- libgphoto2.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libgphoto2.changes b/libgphoto2.changes index ed6f5d7..ec769dc 100644 --- a/libgphoto2.changes +++ b/libgphoto2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 27 08:54:31 CEST 2010 - meissner@suse.de + +- remove the major .la files + ------------------------------------------------------------------- Sun Apr 11 23:25:39 CEST 2010 - meissner@suse.de From 727afabf7c13281901dc999286959ee5258dafe9cacd6e3fa8049c85c92e3a01 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 27 Apr 2010 12:56:36 +0000 Subject: [PATCH 5/6] Accepting request 38908 from graphics checked in (request 38908) OBS-URL: https://build.opensuse.org/request/show/38908 OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=32 --- libgphoto2.changes | 5 ----- libgphoto2.spec | 6 ++---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/libgphoto2.changes b/libgphoto2.changes index ec769dc..ed6f5d7 100644 --- a/libgphoto2.changes +++ b/libgphoto2.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Apr 27 08:54:31 CEST 2010 - meissner@suse.de - -- remove the major .la files - ------------------------------------------------------------------- Sun Apr 11 23:25:39 CEST 2010 - meissner@suse.de diff --git a/libgphoto2.spec b/libgphoto2.spec index c7f2de0..c2dfb10 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -121,10 +121,6 @@ mv doc/doxygen-output/libgphoto2-api.html apidocs fn=$RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libgphoto2_port.pc grep -v driverdir= $fn > $fn.new mv $fn.new $fn -# These two should not be required, but the driver .la can stay -rm $RPM_BUILD_ROOT/%{_libdir}/libgphoto2.la -rm $RPM_BUILD_ROOT/%{_libdir}/libgphoto2_port.la - %fdupes $RPM_BUILD_ROOT %clean @@ -157,7 +153,9 @@ rm -rf $RPM_BUILD_ROOT %{prefix}/bin/gphoto2-config %{prefix}/bin/gphoto2-port-config %{_libdir}/libgphoto2.so +%{_libdir}/libgphoto2.la %{_libdir}/libgphoto2_port.so +%{_libdir}/libgphoto2_port.la %{_libdir}/pkgconfig/libgphoto2.pc %{_libdir}/pkgconfig/libgphoto2_port.pc From bf6d13bd68dbd0a9633b9f7f5c831dbd5056fdd91517c9ce9d3f599023b76709 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 27 Apr 2010 12:56:37 +0000 Subject: [PATCH 6/6] Updating link to change in openSUSE:Factory/libgphoto2 revision 51.0 OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=3f7ab391a471a557efb929415ed724a8 --- libgphoto2.changes | 5 +++++ libgphoto2.spec | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libgphoto2.changes b/libgphoto2.changes index ed6f5d7..ec769dc 100644 --- a/libgphoto2.changes +++ b/libgphoto2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 27 08:54:31 CEST 2010 - meissner@suse.de + +- remove the major .la files + ------------------------------------------------------------------- Sun Apr 11 23:25:39 CEST 2010 - meissner@suse.de diff --git a/libgphoto2.spec b/libgphoto2.spec index c2dfb10..ba63fd9 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -31,7 +31,7 @@ License: LGPLv2.1+ Group: Hardware/Camera Summary: A Digital Camera Library Version: 2.4.9 -Release: 1 +Release: 2 Source0: libgphoto2-%{version}.tar.bz2 Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -121,6 +121,10 @@ mv doc/doxygen-output/libgphoto2-api.html apidocs fn=$RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libgphoto2_port.pc grep -v driverdir= $fn > $fn.new mv $fn.new $fn +# These two should not be required, but the driver .la can stay +rm $RPM_BUILD_ROOT/%{_libdir}/libgphoto2.la +rm $RPM_BUILD_ROOT/%{_libdir}/libgphoto2_port.la + %fdupes $RPM_BUILD_ROOT %clean @@ -153,9 +157,7 @@ rm -rf $RPM_BUILD_ROOT %{prefix}/bin/gphoto2-config %{prefix}/bin/gphoto2-port-config %{_libdir}/libgphoto2.so -%{_libdir}/libgphoto2.la %{_libdir}/libgphoto2_port.so -%{_libdir}/libgphoto2_port.la %{_libdir}/pkgconfig/libgphoto2.pc %{_libdir}/pkgconfig/libgphoto2_port.pc