From f0ad80b8ef853e4115f27e47beb8a7fa57a9f8ce0395abda8d53aee71a9eef08 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 10 Aug 2011 11:17:01 +0000 Subject: [PATCH 1/5] 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 --- ...ompress:download_url:LibRaw-0.13.5.tar.bz2 | 3 --- libraw.changes | 6 +++++ libraw.spec | 25 +++++++++---------- 3 files changed, 18 insertions(+), 16 deletions(-) delete mode 100644 _service:recompress:download_url:LibRaw-0.13.5.tar.bz2 diff --git a/_service:recompress:download_url:LibRaw-0.13.5.tar.bz2 b/_service:recompress:download_url:LibRaw-0.13.5.tar.bz2 deleted file mode 100644 index 139a338..0000000 --- a/_service:recompress:download_url:LibRaw-0.13.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a1208c273163d4c03a09e4832a1732d57f4c6f22bde8a2e5ca1c134645bb2ed0 -size 1003244 diff --git a/libraw.changes b/libraw.changes index ee7b894..87226c2 100644 --- a/libraw.changes +++ b/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 diff --git a/libraw.spec b/libraw.spec index d80358e..4524f58 100644 --- a/libraw.spec +++ b/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,-) From 176a7131f2815d04a3b2f8fc52a1b09f5b72c0ec27b66e6244f498352773b62a Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Tue, 23 Aug 2011 05:56:55 +0000 Subject: [PATCH 2/5] fix build - source is now tar.gz, not bz2 OBS-URL: https://build.opensuse.org/package/show/graphics/libraw?expand=0&rev=44 --- _service:recompress:download_url:LibRaw-0.13.5.tar.bz2 | 3 +++ libraw.spec | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 _service:recompress:download_url:LibRaw-0.13.5.tar.bz2 diff --git a/_service:recompress:download_url:LibRaw-0.13.5.tar.bz2 b/_service:recompress:download_url:LibRaw-0.13.5.tar.bz2 new file mode 100644 index 0000000..139a338 --- /dev/null +++ b/_service:recompress:download_url:LibRaw-0.13.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a1208c273163d4c03a09e4832a1732d57f4c6f22bde8a2e5ca1c134645bb2ed0 +size 1003244 diff --git a/libraw.spec b/libraw.spec index 4524f58..6acb225 100644 --- a/libraw.spec +++ b/libraw.spec @@ -25,7 +25,7 @@ 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/%{tar_name}-%{version}.tar.bz2 +Source0: http://www.libraw.org/data/%{tar_name}-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: libjpeg-devel BuildRequires: liblcms2-devel From a41d31b3350631c348d7862c98af4f00b73524a60530f2daeaa60a4e73c70d07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 23 Aug 2011 07:43:31 +0000 Subject: [PATCH 3/5] Don't recompress OBS-URL: https://build.opensuse.org/package/show/graphics/libraw?expand=0&rev=46 --- _service | 4 ---- _service:download_url:LibRaw-0.13.5.tar.gz | 3 +++ _service:recompress:download_url:LibRaw-0.13.5.tar.bz2 | 3 --- 3 files changed, 3 insertions(+), 7 deletions(-) create mode 100644 _service:download_url:LibRaw-0.13.5.tar.gz delete mode 100644 _service:recompress:download_url:LibRaw-0.13.5.tar.bz2 diff --git a/_service b/_service index b12eb79..5bda98c 100644 --- a/_service +++ b/_service @@ -10,8 +10,4 @@ sha256 7e554d5fd6ca6f430d74e4c7084086cf57bd0c478268412920c0ce2940b86fe8 - - bz2 - *.tar.gz - diff --git a/_service:download_url:LibRaw-0.13.5.tar.gz b/_service:download_url:LibRaw-0.13.5.tar.gz new file mode 100644 index 0000000..f162244 --- /dev/null +++ b/_service:download_url:LibRaw-0.13.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e554d5fd6ca6f430d74e4c7084086cf57bd0c478268412920c0ce2940b86fe8 +size 1314431 diff --git a/_service:recompress:download_url:LibRaw-0.13.5.tar.bz2 b/_service:recompress:download_url:LibRaw-0.13.5.tar.bz2 deleted file mode 100644 index 139a338..0000000 --- a/_service:recompress:download_url:LibRaw-0.13.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a1208c273163d4c03a09e4832a1732d57f4c6f22bde8a2e5ca1c134645bb2ed0 -size 1003244 From 6ea527dab70bca68b79d60416e854f786ede3ad212428f8b55ebfb5a1933f4ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 24 Aug 2011 11:51:40 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/graphics/libraw?expand=0&rev=47 --- _service | 9 ++------- _service:download_files:LibRaw-0.13.5.tar.gz | 3 +++ 2 files changed, 5 insertions(+), 7 deletions(-) create mode 100644 _service:download_files:LibRaw-0.13.5.tar.gz diff --git a/_service b/_service index 5bda98c..adb86e9 100644 --- a/_service +++ b/_service @@ -1,13 +1,8 @@ - http www.libraw.org /data/LibRaw-0.13.5.tar.gz - - _service:download_url:LibRaw-0.13.5.tar.gz - sha256 - 7e554d5fd6ca6f430d74e4c7084086cf57bd0c478268412920c0ce2940b86fe8 - - + + \ No newline at end of file diff --git a/_service:download_files:LibRaw-0.13.5.tar.gz b/_service:download_files:LibRaw-0.13.5.tar.gz new file mode 100644 index 0000000..f162244 --- /dev/null +++ b/_service:download_files:LibRaw-0.13.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e554d5fd6ca6f430d74e4c7084086cf57bd0c478268412920c0ce2940b86fe8 +size 1314431 From 1f8d1a18351f2fee923aae988c2b29c641798d01889ead706e415d379af77831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 24 Aug 2011 11:53:34 +0000 Subject: [PATCH 5/5] - Stop using _service files OBS-URL: https://build.opensuse.org/package/show/graphics/libraw?expand=0&rev=50 --- ...oad_files:LibRaw-0.13.5.tar.gz => LibRaw-0.13.5.tar.gz | 0 _service | 8 -------- _service:download_url:LibRaw-0.13.5.tar.gz | 3 --- libraw.changes | 5 +++++ libraw.spec | 2 +- 5 files changed, 6 insertions(+), 12 deletions(-) rename _service:download_files:LibRaw-0.13.5.tar.gz => LibRaw-0.13.5.tar.gz (100%) delete mode 100644 _service delete mode 100644 _service:download_url:LibRaw-0.13.5.tar.gz diff --git a/_service:download_files:LibRaw-0.13.5.tar.gz b/LibRaw-0.13.5.tar.gz similarity index 100% rename from _service:download_files:LibRaw-0.13.5.tar.gz rename to LibRaw-0.13.5.tar.gz diff --git a/_service b/_service deleted file mode 100644 index adb86e9..0000000 --- a/_service +++ /dev/null @@ -1,8 +0,0 @@ - - - http - www.libraw.org - /data/LibRaw-0.13.5.tar.gz - - - \ No newline at end of file diff --git a/_service:download_url:LibRaw-0.13.5.tar.gz b/_service:download_url:LibRaw-0.13.5.tar.gz deleted file mode 100644 index f162244..0000000 --- a/_service:download_url:LibRaw-0.13.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7e554d5fd6ca6f430d74e4c7084086cf57bd0c478268412920c0ce2940b86fe8 -size 1314431 diff --git a/libraw.changes b/libraw.changes index 87226c2..a8ac9c1 100644 --- a/libraw.changes +++ b/libraw.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 24 11:53:14 UTC 2011 - idonmez@novell.com + +- Stop using _service files + ------------------------------------------------------------------- Tue Aug 9 20:03:58 UTC 2011 - toddrme2178@gmail.com diff --git a/libraw.spec b/libraw.spec index 6acb225..6a31810 100644 --- a/libraw.spec +++ b/libraw.spec @@ -25,7 +25,7 @@ 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/%{tar_name}-%{version}.tar.gz +Source: http://www.libraw.org/data/%{tar_name}-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: libjpeg-devel BuildRequires: liblcms2-devel