Accepting request 78399 from home:TheBlackCat:branches:graphics

- Made html document file non-executable (fix for RPMLINT warning)
- Cleaned up spec file formatting

OBS-URL: https://build.opensuse.org/request/show/78399
OBS-URL: https://build.opensuse.org/package/show/graphics/libraw?expand=0&rev=43

_service:recompress:download_url:LibRaw-0.13.5.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a1208c273163d4c03a09e4832a1732d57f4c6f22bde8a2e5ca1c134645bb2ed0
-size 1003244

libraw.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Aug  9 20:03:58 UTC 2011 - toddrme2178@gmail.com
+
+- Made html document file non-executable (fix for RPMLINT warning)
+- Cleaned up spec file formatting
+
 -------------------------------------------------------------------
 Sun Jun 12 00:07:49 UTC 2011 - Nico.Laus.2001@gmx.de
 

libraw.spec

@@ -16,7 +16,7 @@
 #
 
 
-%define fake_name LibRaw
+%define tar_name LibRaw
 
 Name:           libraw
 Version:        0.13.5
@@ -25,12 +25,11 @@ License:        CDDLv1.0 | LGPLv2.1
 Summary:        Library for reading RAW files obtained from digital photo cameras
 Url:            http://www.libraw.org/
 Group:          System/Libraries
-Source0:        http://www.libraw.org/data/%{fake_name}-%{version}.tar.bz2
+Source0:        http://www.libraw.org/data/%{tar_name}-%{version}.tar.bz2
 BuildRequires:  gcc-c++
-BuildRequires:  make
+BuildRequires:  libjpeg-devel
 BuildRequires:  liblcms2-devel
 BuildRequires:  pkg-config
-BuildRequires:  libjpeg-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -94,11 +93,10 @@ This package contains static libraries that applications can use to build
 against LibRaw. LibRaw does not provide dynamic libraries.
 
 %prep
-%setup -q -n %{fake_name}-%{version}
-#autoreconf -fi
+%setup -q -n %{tar_name}-%{version}
 
 %build
-CXXFLAGS="$RPM_OPT_FLAGS -fPIC" \
+CXXFLAGS="%{optflags} -fPIC" \
 %configure
 # build env is too broken for parallel build
 make
@@ -106,18 +104,19 @@ make
 %install
 mv doc manual
 # The source tree has these with execute permissions for some reason
-%{__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
 # The Libraries
-%makeinstall
+%make_install
 # duplicated files
-%__rm -rf %{buildroot}%{_datadir}/doc
+rm -rf %{buildroot}%{_datadir}/doc
 
 %post -n libraw2 -p /sbin/ldconfig
 
 %postun -n libraw2 -p /sbin/ldconfig
 
 %clean
-%__rm -rf %{buildroot}
+rm -rf %{buildroot}
 
 %files tools
 %defattr(-,root,root,-)
@@ -144,8 +143,8 @@ mv doc manual
 
 %files -n libraw2
 %defattr(-,root,root,-)
-%_libdir/libraw.so.*
-%_libdir/libraw_r.so.*
+%{_libdir}/libraw.so.*
+%{_libdir}/libraw_r.so.*
 
 %files devel-static
 %defattr(-,root,root,-)