Accepting request 79396 from KDE:Distro:Factory

forward to factory

OBS-URL: https://build.opensuse.org/request/show/79396
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libkdcraw?expand=0&rev=3
This commit is contained in:
Sascha Peilicke
2011-08-23 13:18:05 +00:00
committed by Git OBS Bridge
parent 07f8fe9b53
commit 9fab219a10
4 changed files with 61 additions and 33 deletions
+6
View File
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Aug 15 10:02:14 UTC 2011 - idonmez@novell.com
- Add libraw-disable-mosaic-packs.patch: don't build libraw mosaic
packs due to GPLv2,v3 licensing, bnc #711963
-------------------------------------------------------------------
Fri Jul 22 20:27:33 CEST 2011 - dmueller@suse.de
+40 -26
View File
@@ -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
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
License: LGPLv2.1+
Summary: Shared library interface around dcraw
Url: http://www.kde.org
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 @@ files.
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 @@ programs.
%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
@@ -76,11 +90,11 @@ files.
This library is used by kipi-plugins, digiKam and others kipi host
programs.
%files -n libkdcraw20
%files -n libkdcraw20
%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 @@ programs.
%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
@@ -101,10 +115,10 @@ files.
This library is used by kipi-plugins, digiKam and others kipi host
programs.
%files devel
%files devel
%defattr(-,root,root)
%doc COPYING README
/usr/include/libkdcraw/
%{_includedir}/libkdcraw/
%_kde4_libdir/libkdcraw.so
%_kde4_libdir/pkgconfig/libkdcraw.pc
-7
View File
@@ -1,7 +0,0 @@
package: kdegraphics-4.4.3.tar.bz2
kdemod: kdegraphics
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
+current HEAD: 1127686
+svn di between //tags/KDE/4.4.3/kdegraphics and //branches/KDE/4.4/kdegraphics
+15
View File
@@ -0,0 +1,15 @@
--- 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})