Accepting request 147957 from home:jengelh:branches:graphics

- 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

OBS-URL: https://build.opensuse.org/request/show/147957
OBS-URL: https://build.opensuse.org/package/show/graphics/libraw?expand=0&rev=58
This commit is contained in:
OBS User mrdocs 2013-01-10 21:51:04 +00:00 committed by Git OBS Bridge
parent 20f2b83a9c
commit 10bae8af1c
2 changed files with 25 additions and 15 deletions

View File

@ -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 Wed Jul 11 11:08:57 UTC 2012 - lists.nico.k@googlemail.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package libraw # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -19,15 +19,19 @@
%define tar_name LibRaw %define tar_name LibRaw
Name: libraw Name: libraw
%define lname libraw5
Version: 0.14.7 Version: 0.14.7
Release: 0 Release: 0
Summary: Library for reading RAW files obtained from digital photo cameras Summary: Library for reading RAW files obtained from digital photo cameras
License: CDDL-1.0 or LGPL-2.1 License: CDDL-1.0 or LGPL-2.1
Group: System/Libraries Group: System/Libraries
Url: http://www.libraw.org/ Url: http://www.libraw.org/
#Git-Clone: git://github.com/LibRaw/LibRaw
Source: http://www.libraw.org/data/%{tar_name}-%{version}.tar.gz 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. # PATCH-FIX-UPSTREAM libraw-gcc47.patch dimstar@opensuse.org -- Fix build with gcc 4.7.
Patch0: libraw-gcc47.patch Patch0: libraw-gcc47.patch
BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libjasper-devel BuildRequires: libjasper-devel
BuildRequires: libjpeg-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 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. 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 Summary: Library for reading RAW files obtained from digital photo cameras
Group: System/Libraries Group: System/Libraries
%description -n libraw2 %description -n %lname
LibRaw is a library for reading RAW files obtained from digital photo LibRaw is a library for reading RAW files obtained from digital photo
cameras (CRW/CR2, NEF, RAF, DNG, and others). 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 %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Group: Development/Libraries/Other Group: Development/Libraries/Other
Requires: libraw2 = %{version} Requires: %lname = %version
%description devel %description devel
LibRaw is a library for reading RAW files obtained from digital photo 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 Changelog.txt LICENSE.CDDL LICENSE.LGPL LICENSE.LibRaw.pdf
chmod -x manual/index.html chmod -x manual/index.html
# The Libraries # The Libraries
%make_install make install DESTDIR="%buildroot"
rm -f "%buildroot/%_libdir"/*.la
# duplicated files # duplicated files
rm -rf %{buildroot}%{_datadir}/doc 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 %postun -n %lname -p /sbin/ldconfig
%clean
rm -rf %{buildroot}
%files tools %files tools
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -140,13 +143,11 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/libraw_r.pc %{_libdir}/pkgconfig/libraw_r.pc
%{_libdir}/libraw.so %{_libdir}/libraw.so
%{_libdir}/libraw_r.so %{_libdir}/libraw_r.so
%{_libdir}/libraw.la
%{_libdir}/libraw_r.la
%files -n libraw2 %files -n %lname
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/libraw.so.* %{_libdir}/libraw.so.5*
%{_libdir}/libraw_r.so.* %{_libdir}/libraw_r.so.5*
%files devel-static %files devel-static
%defattr(-,root,root,-) %defattr(-,root,root,-)