Hello community, here is the log from the commit of package libkdcraw for openSUSE:Factory checked in at Tue Aug 23 15:18:10 CEST 2011.
-------- --- libkdcraw/libkdcraw.changes 2011-07-22 20:27:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/libkdcraw/libkdcraw.changes 2011-08-15 12:09:09.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 15 10:02:14 UTC 2011 - [email protected] + +- Add libraw-disable-mosaic-packs.patch: don't build libraw mosaic + packs due to GPLv2,v3 licensing, bnc #711963 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 4_6_BRANCH.diff New: ---- libraw-disable-mosaic-packs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkdcraw.spec ++++++ --- /var/tmp/diff_new_pack.3FNDS3/_old 2011-08-23 15:17:16.000000000 +0200 +++ /var/tmp/diff_new_pack.3FNDS3/_new 2011-08-23 15:17:16.000000000 +0200 @@ -18,22 +18,34 @@ Name: libkdcraw -BuildRequires: OpenEXR-devel fribidi-devel libkde4-devel net-snmp-devel -BuildRequires: chmlib-devel libexiv2-devel libgphoto2-devel -BuildRequires: libqimageblitz-devel oxygen-icon-theme-large -BuildRequires: libdjvulibre-devel texlive texlive-devel texlive-latex -BuildRequires: libspectre-devel -BuildRequires: libepub-devel libpoppler-qt4-devel libqca2-devel -BuildRequires: libsoprano-devel soprano-backend-redland -BuildRequires: libraw-devel +Version: 4.7.0 +Release: 3 License: LGPLv2.1+ -Group: Development/Libraries/KDE Summary: Shared library interface around dcraw Url: http://www.kde.org -Version: 4.7.0 -Release: 1 -Source0: %{name}-%version.tar.bz2 -Patch0: 4_6_BRANCH.diff +Group: Development/Libraries/KDE +Source0: %{name}-%{version}.tar.bz2 +Patch1: libraw-disable-mosaic-packs.patch +BuildRequires: OpenEXR-devel +BuildRequires: chmlib-devel +BuildRequires: fribidi-devel +BuildRequires: libdjvulibre-devel +BuildRequires: libepub-devel +BuildRequires: libexiv2-devel +BuildRequires: libgphoto2-devel +BuildRequires: libkde4-devel +BuildRequires: libpoppler-qt4-devel +BuildRequires: libqca2-devel +BuildRequires: libqimageblitz-devel +BuildRequires: libraw-devel +BuildRequires: libsoprano-devel +BuildRequires: libspectre-devel +BuildRequires: net-snmp-devel +BuildRequires: oxygen-icon-theme-large +BuildRequires: soprano-backend-redland +BuildRequires: texlive +BuildRequires: texlive-devel +BuildRequires: texlive-latex BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -45,10 +57,12 @@ This library is used by kipi-plugins, digiKam and others kipi host programs. - %prep -%setup -q -n %{name}-%version -%patch0 +%setup -q -n %{name}-%{version} +%patch1 + +# Remove GPLd mosaic packs +rm -rf libraw/demosaic-pack-* %build %cmake_kde4 -d build @@ -56,16 +70,16 @@ %install cd build - %makeinstall +%make_install %kde_post_install %clean - rm -rf $RPM_BUILD_ROOT + rm -rf %{buildroot} %package -n libkdcraw20 License: LGPLv2.1+ -Group: Development/Libraries/KDE Summary: Shared library interface around dcraw +Group: Development/Libraries/KDE %requires_ge libqt4-x11 %description -n libkdcraw20 @@ -80,7 +94,7 @@ %defattr(-,root,root) %_kde4_appsdir/libkdcraw/ %_kde4_libdir/libkdcraw.so.* -%_datadir/icons/hicolor/*/apps/kdcraw.png +%{_datadir}/icons/hicolor/*/apps/kdcraw.png %post -n libkdcraw20 -p /sbin/ldconfig @@ -88,9 +102,9 @@ %package devel License: LGPLv2.1+ -Group: Development/Libraries/KDE Summary: Shared library interface around dcraw -Requires: libkdcraw20 = %version +Group: Development/Libraries/KDE +Requires: libkdcraw20 = %{version} Requires: libkde4-devel %description devel @@ -104,7 +118,7 @@ %files devel %defattr(-,root,root) %doc COPYING README -/usr/include/libkdcraw/ +%{_includedir}/libkdcraw/ %_kde4_libdir/libkdcraw.so %_kde4_libdir/pkgconfig/libkdcraw.pc ++++++ libraw-disable-mosaic-packs.patch ++++++ --- CMakeLists.txt 2011-06-22 16:54:21.000000000 +0200 +++ CMakeLists.txt 2011-08-15 12:01:18.230200249 +0200 @@ -136,12 +136,6 @@ # Flag to debug LibRaw ADD_DEFINITIONS(-DDCRAW_VERBOSE) -# Flag to include demosaic pack GPL2 -ADD_DEFINITIONS(-DLIBRAW_DEMOSAIC_PACK_GPL2) - -# Flag to include demosaic pack GPL3 -ADD_DEFINITIONS(-DLIBRAW_DEMOSAIC_PACK_GPL3) - # LibRaw use C++ exception. ADD_DEFINITIONS(${KDE4_ENABLE_EXCEPTIONS}) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
