From 7f5fda659466dc47450cf33c65c2ae51548ed44b0c85ea86f36c88c9dc6e2e18 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 9 Aug 2007 13:49:26 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libgphoto2?expand=0&rev=11 --- libgphoto2.changes | 7 +++++++ libgphoto2.spec | 20 +++++++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/libgphoto2.changes b/libgphoto2.changes index 1120c22..252dd7e 100644 --- a/libgphoto2.changes +++ b/libgphoto2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Aug 7 20:43:01 CEST 2007 - maw@suse.de + +- Use %fdupes +- Split off a -lang subpackage +- s#%run_ldconfig#/sbin/ldconfig/ in %post and %postun. + ------------------------------------------------------------------- Mon Jul 30 08:47:46 CEST 2007 - meissner@suse.de diff --git a/libgphoto2.spec b/libgphoto2.spec index 2d19c4e..b052d2b 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -11,14 +11,14 @@ # norootforbuild Name: libgphoto2 -BuildRequires: doxygen gcc-c++ hal-devel libexif-devel libjpeg-devel libusb-devel resmgr +BuildRequires: doxygen fdupes gcc-c++ hal-devel libexif-devel libjpeg-devel libusb-devel resmgr URL: http://gphoto.org/ %define prefix /usr License: LGPL v2 or later, individual distribution permission. Group: Hardware/Camera Summary: A Digital Camera Library Version: 2.4.0 -Release: 1 +Release: 4 Source0: libgphoto2-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %package devel @@ -27,6 +27,7 @@ License: LGPL v2 or later, individual distribution permission. Group: Hardware/Camera Requires: libgphoto2 = %version libusb-devel Requires: libexif-devel +Requires: %{name}-lang = %{version} %description gPhoto (GNU Photo) is a set of libraries for previewing, retrieving, @@ -134,6 +135,7 @@ Authors: Hans Ulrich Niedermann Colin Marquardt +%lang_package %prep %setup -q @@ -189,10 +191,12 @@ rm $RPM_BUILD_ROOT/usr/%_lib/udev/check-mtp-device rm $RPM_BUILD_ROOT/usr/%_lib/udev/check-ptp-camera mv doc/doxygen-output/libgphoto2-api.html apidocs +%fdupes $RPM_BUILD_ROOT + %clean rm -rf $RPM_BUILD_ROOT -%files -f libgphoto2-all.lang +%files %defattr(-,root,root) %{_libdir}/libgphoto2 %{_libdir}/libgphoto2_port @@ -211,6 +215,8 @@ rm -rf $RPM_BUILD_ROOT # /usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2-device.fdi %endif +%files lang -f libgphoto2-all.lang + %files devel %defattr(-,root,root) %doc apidocs @@ -225,12 +231,16 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libgphoto2_port.pc %post -%run_ldconfig +/sbin/ldconfig %postun -%run_ldconfig +/sbin/ldconfig %changelog +* Tue Aug 07 2007 - maw@suse.de +- Use %%fdupes +- Split off a -lang subpackage +- s#%%run_ldconfig#/sbin/ldconfig/ in %%post and %%postun. * Mon Jul 30 2007 - meissner@suse.de - upgraded to 2.4.0 final - only small fixes and some new USB ids