diff --git a/libraw.changes b/libraw.changes index 09cee25..65ba1c5 100644 --- a/libraw.changes +++ b/libraw.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jan 10 18:42:28 UTC 2013 - jengelh@inai.de + +- SONAME changed in 0.14, but prior update omitted package name + change libraw2 -> libraw5. Do it now. +- Use more robust make install call +- Remove redundant %clean section, and remove unused .la files +- Run fdupes to hardlink duplicate files + ------------------------------------------------------------------- Wed Jul 11 11:08:57 UTC 2012 - lists.nico.k@googlemail.com diff --git a/libraw.spec b/libraw.spec index b13e03a..96ee200 100644 --- a/libraw.spec +++ b/libraw.spec @@ -1,7 +1,7 @@ # # spec file for package libraw # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,15 +19,19 @@ %define tar_name LibRaw Name: libraw +%define lname libraw5 Version: 0.14.7 Release: 0 Summary: Library for reading RAW files obtained from digital photo cameras License: CDDL-1.0 or LGPL-2.1 Group: System/Libraries Url: http://www.libraw.org/ + +#Git-Clone: git://github.com/LibRaw/LibRaw Source: http://www.libraw.org/data/%{tar_name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM libraw-gcc47.patch dimstar@opensuse.org -- Fix build with gcc 4.7. Patch0: libraw-gcc47.patch +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libjasper-devel BuildRequires: libjpeg-devel @@ -53,11 +57,11 @@ cameras (CRW/CR2, NEF, RAF, DNG, and others). LibRaw is based on the source codes of the dcraw utility, where part of drawbacks have already been eliminated and part will be fixed in future. -%package -n libraw2 +%package -n %lname Summary: Library for reading RAW files obtained from digital photo cameras Group: System/Libraries -%description -n libraw2 +%description -n %lname LibRaw is a library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others). @@ -67,7 +71,7 @@ drawbacks have already been eliminated and part will be fixed in future. %package devel Summary: Development files for %{name} Group: Development/Libraries/Other -Requires: libraw2 = %{version} +Requires: %lname = %version %description devel LibRaw is a library for reading RAW files obtained from digital photo @@ -107,16 +111,15 @@ mv doc manual chmod -x Changelog.txt LICENSE.CDDL LICENSE.LGPL LICENSE.LibRaw.pdf chmod -x manual/index.html # The Libraries -%make_install +make install DESTDIR="%buildroot" +rm -f "%buildroot/%_libdir"/*.la # duplicated files rm -rf %{buildroot}%{_datadir}/doc +%fdupes %buildroot/%_prefix -%post -n libraw2 -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig -%postun -n libraw2 -p /sbin/ldconfig - -%clean -rm -rf %{buildroot} +%postun -n %lname -p /sbin/ldconfig %files tools %defattr(-,root,root,-) @@ -140,13 +143,11 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/libraw_r.pc %{_libdir}/libraw.so %{_libdir}/libraw_r.so -%{_libdir}/libraw.la -%{_libdir}/libraw_r.la -%files -n libraw2 +%files -n %lname %defattr(-,root,root,-) -%{_libdir}/libraw.so.* -%{_libdir}/libraw_r.so.* +%{_libdir}/libraw.so.5* +%{_libdir}/libraw_r.so.5* %files devel-static %defattr(-,root,root,-)