SPECS: kde4-kdegraphics.spec - merged from DEVEL - 4.2.0 stable - rel 3

shadzik shadzik at pld-linux.org
Tue Feb 3 14:52:04 CET 2009 

Author: shadzik                      Date: Tue Feb  3 13:52:04 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL
- 4.2.0 stable
- rel 3

---- Files affected:
SPECS:
   kde4-kdegraphics.spec (1.53 -> 1.54) 

---- Diffs:

================================================================
Index: SPECS/kde4-kdegraphics.spec
diff -u SPECS/kde4-kdegraphics.spec:1.53 SPECS/kde4-kdegraphics.spec:1.54
--- SPECS/kde4-kdegraphics.spec:1.53	Sat Sep 13 21:32:43 2008
+++ SPECS/kde4-kdegraphics.spec	Tue Feb  3 14:51:59 2009
@@ -3,6 +3,7 @@
 # Conditional build:
 #
 %define		_state		stable
+%define		qtver		4.4.3
 
 %define	orgname	kdegraphics
 Summary:	K Desktop Environment - Graphic Applications
@@ -10,18 +11,22 @@
 Summary(pl.UTF-8):	K Desktop Environment - Aplikacje graficzne
 Summary(pt_BR.UTF-8):	K Desktop Environment - Aplicações gráficas
 Name:		kde4-kdegraphics
-Version:	4.1.1
-Release:	0.1
+Version:	4.2.0
+Release:	3
 License:	GPL
 Group:		X11/Applications/Graphics
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	e5475d37dc0a12b6ce7e6dbebceb9340
+# Source0-md5:	8beb6fe5d475d0b0245ea6d4cc7e9732
+Patch0:		%{name}-CMakeLists.patch
 URL:		http://www.kde.org/
 BuildRequires:	OpenEXR-devel >= 1.1.0
 BuildRequires:	OpenGL-GLU-devel
+BuildRequires:	QtCore-devel >= %{qtver}
+BuildRequires:	automoc4 >= 0.9.88
 BuildRequires:	chmlib-devel
-BuildRequires:	cmake
+BuildRequires:	cmake >= 2.6.2
 BuildRequires:	djvulibre-devel
+BuildRequires:	ebook-tools-devel
 BuildRequires:	ed
 BuildRequires:	exiv2-devel
 BuildRequires:	fribidi-devel >= 0.10.4
@@ -29,7 +34,6 @@
 BuildRequires:	ghostscript-devel
 BuildRequires:	giflib-devel
 BuildRequires:	imlib-devel
-BuildRequires:	ebook-tools-devel
 BuildRequires:	kde4-kdelibs-devel >= %{version}
 BuildRequires:	kpathsea
 BuildRequires:	lcms-devel
@@ -44,8 +48,7 @@
 BuildRequires:	libxml2-progs
 BuildRequires:	poppler-Qt-devel
 BuildRequires:	poppler-qt-devel
-BuildRequires:	qca-devel
-BuildRequires:	qimageblitz-devel
+BuildRequires:	qca-devel >= 2.0.0
 BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRequires:	sane-backends-devel
 BuildRequires:	xorg-lib-libXxf86vm-devel
@@ -125,6 +128,9 @@
 Requires:	%{name}-gwenview = %{version}-%{release}
 Requires:	%{name}-kolourpaint = %{version}-%{release}
 Requires:	%{name}-ksane = %{version}-%{release}
+Requires:	kde4-libkdcraw = %{version}-%{release}
+Requires:	kde4-libkexiv2 = %{version}-%{release}
+Requires:	kde4-libkipi = %{version}-%{release}
 Requires:	%{name}-okular = %{version}-%{release}
 Requires:	kde4-kdelibs-devel
 
@@ -142,7 +148,7 @@
 Summary:	Digital camera support
 Summary(pl.UTF-8):	Obsługa kamer cyfrowych
 Group:		X11/Applications/Graphics
-Requires:	kde4-kdebase-core >= %{version}
+Requires:	kde4-kdebase >= %{version}
 
 %description kamera
 kamera is an IO slave and a KControl panel module which allows you to
@@ -153,12 +159,12 @@
 then start accessing the camera contents with a kamera:/ URL.
 
 %description kamera -l pl.UTF-8
-kamera to moduł IO slave oraz panelu KControl umożliwiający dostęp
-do folderów i zdjęć w dowolnym aparacie cyfrowym obsługiwanym
-przez biblioteki gPhoto2. Jeśli mamy obsługiwany aparat, można
-zacząć używać go w większości aplikacji KDE w dwóch krokach:
-wybrać model i port aparatu z listy w KControl, a następnie
-odwoływać się do zawartości aparatu przez URL kamera:/.
+kamera to moduł IO slave oraz panelu KControl umożliwiający dostęp do
+folderów i zdjęć w dowolnym aparacie cyfrowym obsługiwanym przez
+biblioteki gPhoto2. Jeśli mamy obsługiwany aparat, można zacząć używać
+go w większości aplikacji KDE w dwóch krokach: wybrać model i port
+aparatu z listy w KControl, a następnie odwoływać się do zawartości
+aparatu przez URL kamera:/.
 
 %package kcolorchooser
 Summary:	Color chooser
@@ -183,14 +189,14 @@
 with file enhanced informations.
 
 %description kfile -l pl.UTF-8
-Ten pakiet dodaje do okna dialogowego "właściwości pliku"
-konquerora dodatkową zakładkę z rozszerzonymi informacjami o pliku.
+Ten pakiet dodaje do okna dialogowego "właściwości pliku" konquerora
+dodatkową zakładkę z rozszerzonymi informacjami o pliku.
 
 %package kgamma
 Summary:	A monitor calibration tool
 Summary(pl.UTF-8):	Narzędzie do kalibracji monitora
 Group:		X11/Applications/Graphics
-Requires:	kde4-kdebase-core >= %{version}
+Requires:	kde4-kdebase >= %{version}
 
 %description kgamma
 A monitor calibration tool.
@@ -203,7 +209,7 @@
 Summary(pl.UTF-8):	Program graficzny KDE
 Summary(pt_BR.UTF-8):	Editor básico de imagens bitmap
 Group:		X11/Applications/Graphics
-Requires:	kde4-kdebase-core >= %{version}
+Requires:	kde4-kdebase >= %{version}
 
 %description kolourpaint
 A (very) simple painting program for KDE.
@@ -219,15 +225,15 @@
 Summary(pl.UTF-8):	Linijka dla KDE
 Summary(pt_BR.UTF-8):	Régua de pixels para a tela
 Group:		X11/Applications/Graphics
-Requires:	kde4-kdebase-core >= %{version}
+Requires:	kde4-kdebase >= %{version}
 
 %description kruler
 KRuler is a very simple application, with only one aim in life. To
 measure distances on your screen.
 
 %description kruler -l pl.UTF-8
-KRuler jest prostą aplikacją, z tylko jednym celem w życiu:
-mierzenie odległości na ekranie.
+KRuler jest prostą aplikacją, z tylko jednym celem w życiu: mierzenie
+odległości na ekranie.
 
 %description kruler -l pt_BR.UTF-8
 Régua de pixels para a tela.
@@ -237,7 +243,7 @@
 Summary(pl.UTF-8):	Narzędzie do skanowania
 Summary(pt_BR.UTF-8):	Um programa de rasterização de imagens, baseado no SANE e libkscan
 Group:		X11/Applications/Graphics
-Requires:	kde4-kdebase-core >= %{version}
+Requires:	kde4-kdebase >= %{version}
 Obsoletes:	kde4-kdegraphics-kscanservice
 Conflicts:	kde4-kdegraphics-kscanservice
 
@@ -257,7 +263,7 @@
 Summary(pl.UTF-8):	Program do przechwytywania ekranu dla KDE
 Summary(pt_BR.UTF-8):	Programa de captura de tela
 Group:		X11/Applications/Graphics
-Requires:	kde4-kdebase-core >= %{version}
+Requires:	kde4-kdebase >= %{version}
 
 %description ksnapshot
 KSnapshot is a simple application for taking screenshots. It is
@@ -266,8 +272,8 @@
 
 %description ksnapshot -l pl.UTF-8
 KSnapshot to prosta aplikacja do robienia zrzutów ekranu. Potrafi
-przechwytywać obraz całego pulpitu lub tylko pojedynczego okna.
-Obrazy mogą być następnie zapisane w wielu formatach.
+przechwytywać obraz całego pulpitu lub tylko pojedynczego okna. Obrazy
+mogą być następnie zapisane w wielu formatach.
 
 %description ksnapshot -l pt_BR.UTF-8
 Programa de captura de tela.
@@ -314,16 +320,17 @@
 supports.
 
 %description gwenview -l pl.UTF-8
-Gwenview to przeglądarka obrazków dla KDE. Ma okno z drzewem
-katalogów oraz okno z listą plików w celu zapewnienia łatwej
-nawigacji w hierarchii plików. Wczytywanie obrazków jest wykonywane
-przez bibliotekę Qt, więc przeglądarka obsługuje wszystkie formaty
+Gwenview to przeglądarka obrazków dla KDE. Ma okno z drzewem katalogów
+oraz okno z listą plików w celu zapewnienia łatwej nawigacji w
+hierarchii plików. Wczytywanie obrazków jest wykonywane przez
+bibliotekę Qt, więc przeglądarka obsługuje wszystkie formaty
 obsługiwane przez zainstalowaną wersję Qt.
 
 %package -n kde4-libkdcraw
 Summary:	KDcraw libary
 Summary(pl.UTF-8):	Biblioteka KDcraw
 Group:		X11/Libraries
+Obsoletes:	libkdcraw
 
 %description -n kde4-libkdcraw
 The KDcraw Library is part of the KIPI Project.
@@ -342,26 +349,28 @@
 %description -n kde4-libkexiv2 -l pl.UTF-8
 libkexiv2.
 
-%package -n kde4-kipiplugins
-Summary:	kipiplugins libary
-Summary(pl.UTF-8):	Biblioteka kipiplugins
+%package -n kde4-libkipi
+Summary:	kipi libary
+Summary(pl.UTF-8):	Biblioteka kipi
 Group:		X11/Libraries
-Conflicts:	libkipi
+Obsoletes:	kde4-kipiplugins
 
-%description -n kde4-kipiplugins
-kipiplugins.
+%description -n kde4-libkipi
+libkipi.
 
-%description -n kde4-kipiplugins -l pl.UTF-8
-kipiplugins.
+%description -n kde4-libkipi -l pl.UTF-8
+libkipi.
 
 %prep
 %setup -q -n %{orgname}-%{version}
+%patch0 -p0
 
 %build
 install -d build
 cd build
 %cmake \
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+	-DGWENVIEW_SEMANTICINFO_BACKEND=Nepomuk \
 	-DSYSCONF_INSTALL_DIR=%{_sysconfdir} \
 %if "%{_lib}" == "lib64"
 	-DLIB_SUFFIX=64 \
@@ -392,16 +401,31 @@
 %post	gwenview	-p /sbin/ldconfig
 %postun	gwenview	-p /sbin/ldconfig
 
+%post	-n kde4-libkexiv2	-p /sbin/ldconfig
+%postun	-n kde4-libkexiv2	-p /sbin/ldconfig
+
+%post	-n kde4-libkdcraw	-p /sbin/ldconfig
+%postun	-n kde4-libkdcraw	-p /sbin/ldconfig
+
+%post	-n kde4-libkipi	-p /sbin/ldconfig
+%postun	-n kde4-libkipi	-p /sbin/ldconfig
+
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libkolourpaint_lgpl.so
 %attr(755,root,root) %{_libdir}/libokularcore.so
 %attr(755,root,root) %{_libdir}/libgwenviewlib.so
 %attr(755,root,root) %{_libdir}/libksane.so
+%attr(755,root,root) %{_libdir}/libkexiv2.so
+%attr(755,root,root) %{_libdir}/libkdcraw.so
+%attr(755,root,root) %{_libdir}/libkipi.so
 %{_includedir}/libksane
 %{_includedir}/okular
 %{_datadir}/apps/cmake/modules/FindOkular.cmake
 %{_datadir}/apps/cmake/modules/FindKSane.cmake
+%{_pkgconfigdir}/libkdcraw.pc
+%{_pkgconfigdir}/libkexiv2.pc
+%{_pkgconfigdir}/libkipi.pc
 %{_pkgconfigdir}/libksane.pc
 %{_includedir}/libkdcraw
 %{_includedir}/libkexiv2
@@ -413,7 +437,7 @@
 %attr(755,root,root) %{_libdir}/kde4/kio_kamera.so
 %{_datadir}/kde4/services/kamera.desktop
 %{_datadir}/kde4/services/camera.protocol
-%{_kdedocdir}/en/kamera
+%{_kdedocdir}/en/kcontrol/kamera
 
 %files kcolorchooser
 %defattr(644,root,root,755)
@@ -435,6 +459,7 @@
 %{_datadir}/apps/kgamma
 %{_datadir}/kde4/services/kgamma.desktop
 %{_iconsdir}/*/*/apps/kgamma.png
+%{_kdedocdir}/en/kgamma/
 
 %files kolourpaint
 %defattr(644,root,root,755)
@@ -458,7 +483,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libksane.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libksane.so.?
-%{_libdir}/kde4/ksaneplugin.so
+%attr(755,root,root) %{_libdir}/kde4/ksaneplugin.so
 %{_datadir}/kde4/services/ksane_scan_service.desktop
 
 %files ksnapshot
@@ -493,7 +518,7 @@
 %{_datadir}/kde4/services/ServiceMenus/slideshow.desktop
 #
 %{_iconsdir}/hicolor/*/apps/okular.png
-%{_iconsdir}/hicolor/scalable/apps/okular.svgz
+#%{_iconsdir}/hicolor/scalable/apps/okular.svgz
 %{_kdedocdir}/en/okular
 
 %files gwenview
@@ -514,34 +539,28 @@
 %{_datadir}/kde4/services/gvpart.desktop
 %{_desktopdir}/kde4/gwenview.desktop
 %{_iconsdir}/*/*/apps/gwenview.png
-%{_iconsdir}/*/scalable/apps/gwenview.svgz
+#%{_iconsdir}/*/scalable/apps/gwenview.svgz
 %{_kdedocdir}/en/gwenview
 
 %files -n kde4-libkdcraw
 %defattr(644,root,root,755)
-%{_libdir}/libkdcraw.so
-%attr(755,root,root) %{_libdir}/libkdcraw.so.5
-%attr(755,root,root) %{_libdir}/libkdcraw.so.5.0.0
-%dir %{_libdir}/libkdcraw5
-%attr(755,root,root) %{_libdir}/libkdcraw5/kdcraw
-%{_libdir}/libkdcraw5/CAMERALIST
-%{_pkgconfigdir}/libkdcraw.pc
+%attr(755,root,root) %ghost %{_libdir}/libkdcraw.so.?
+%attr(755,root,root) %{_libdir}/libkdcraw.so.*.*.*
+#%dir %{_libdir}/libkdcraw6
+#%attr(755,root,root) %{_libdir}/libkdcraw6/kdcraw
+#%{_libdir}/libkdcraw6/CAMERALIST
 %{_datadir}/apps/libkdcraw
 %{_iconsdir}/hicolor/*x*/apps/kdcraw.png
 
 %files -n kde4-libkexiv2
 %defattr(644,root,root,755)
-%{_libdir}/libkexiv2.so
-%attr(755,root,root) %{_libdir}/libkexiv2.so.6
-%attr(755,root,root) %{_libdir}/libkexiv2.so.6.0.0
-%{_pkgconfigdir}/libkexiv2.pc
+%attr(755,root,root) %ghost %{_libdir}/libkexiv2.so.?
+%attr(755,root,root) %{_libdir}/libkexiv2.so.*.*.*
 
-%files -n kde4-kipiplugins
+%files -n kde4-libkipi
 %defattr(644,root,root,755)
-%{_libdir}/libkipi.so
-%attr(755,root,root) %{_libdir}/libkipi.so.5
-%attr(755,root,root) %{_libdir}/libkipi.so.5.0.0
-%{_pkgconfigdir}/libkipi.pc
+%attr(755,root,root) %ghost %{_libdir}/libkipi.so.?
+%attr(755,root,root) %{_libdir}/libkipi.so.*.*.*
 %{_datadir}/apps/kipi
 %{_iconsdir}/hicolor/*x*/apps/kipi.png
 %{_iconsdir}/hicolor/16x16/actions/black-white.png
@@ -555,16 +574,128 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.53  2008/09/13 19:32:43  witekfl
-- up to 4.1.1
-- rel 0.1
-
-Revision 1.52  2008/08/26 14:04:20  pluto
-- BR: qimageblitz-devel.
-
-Revision 1.51  2008/08/09 16:42:42  shadzik
-- BR cmake
-- don't export QTDIR
+Revision 1.54  2009/02/03 13:51:59  shadzik
+- merged from DEVEL
+- 4.2.0 stable
+- rel 3
+
+Revision 1.50.2.37  2009/01/22 19:38:42  shadzik
+- BR: automoc4 >= 0.9.88
+- rel 2
+
+Revision 1.50.2.36  2009/01/22 15:41:10  shadzik
+- 4.2.0
+
+Revision 1.50.2.35  2009/01/07 19:28:59  shadzik
+- 4.2 RC1
+
+Revision 1.50.2.34  2009/01/05 17:53:39  glen
+- revert source url change
+
+Revision 1.50.2.33  2009/01/03 17:22:52  rotom
+- up to 4.1.87
+
+Revision 1.50.2.32  2008/12/28 14:58:51  glen
+- remove C libkipi to allow simulatenous installs
+- pkgconfig files to -devel; rel 2
+
+Revision 1.50.2.31  2008/12/15 15:59:01  shadzik
+- 4.1.85
+
+Revision 1.50.2.30  2008/12/12 13:34:52  glen
+- kde4-libkdcraw replaces libkdcraw (green light from shadzik); rel 2
+
+Revision 1.50.2.29  2008/12/09 22:01:56  glen
+- +x kde4/ksaneplugin.so
+
+Revision 1.50.2.28  2008/12/08 16:06:32  paszczus
+- updated to 4.1.82
+
+Revision 1.50.2.27  2008/11/29 04:14:24  shadzik
+- 4.1.81
+
+Revision 1.50.2.26  2008/11/26 20:28:43  shadzik
+- 4.2 beta1
+
+Revision 1.50.2.25  2008/11/19 09:51:13  shadzik
+- fixed R:
+- by Michal Kochanowicz <michal at michal dot waw dot pl>
+
+Revision 1.50.2.24  2008/11/18 13:07:47  shadzik
+- fix -devel Requirements
+
+Revision 1.50.2.23  2008/11/17 23:02:12  shadzik
+- add patch0 to not to show a message indicating that libkipi is not present in our system
+  (of course it's not, kde4-kdegraphics provides it)
+
+Revision 1.50.2.22  2008/11/17 22:56:41  shadzik
+- oops, fix %post %postun
+
+Revision 1.50.2.21  2008/11/17 22:54:36  shadzik
+- bleh, -kipiplugins? really? it's libkipi!!!
+- ghost symlinks
+- add Rs to -devel subpackage
+
+Revision 1.50.2.20  2008/11/14 10:35:28  paszczus
+- updated cmake BR
+
+Revision 1.50.2.19  2008/11/14 08:42:34  paszczus
+- updated to 4.1.73
+
+Revision 1.50.2.18  2008/11/06 04:14:26  shadzik
+- 4.1.72
+
+Revision 1.50.2.17  2008/11/01 14:13:36  rotom
+- added support for Nepomuk in Gwenview
+
+Revision 1.50.2.16  2008/10/23 17:55:37  paszczus
+- updated to 4.1.71
+
+Revision 1.50.2.15  2008/10/20 00:55:57  shadzik
+- rel up and qtver bump up
+
+Revision 1.50.2.14  2008/10/20 00:52:02  shadzik
+- s/kde4-kdebase-core/kde4-kdebase/g in Rs
+
+Revision 1.50.2.13  2008/10/18 15:57:38  rotom
+- up to 4.1.70
+- adaptized
+
+Revision 1.50.2.12  2008/10/10 12:25:21  paszczus
+- updated to 4.1.69
+
+Revision 1.50.2.11  2008/10/02 15:20:50  paszczus
+- updated to 4.1.68
+
+Revision 1.50.2.10  2008/09/20 13:28:29  paszczus
+- updated to 4.1.67
+
+Revision 1.50.2.9  2008/09/04 20:44:15  paszczus
+- updated to 4.1.65
+
+Revision 1.50.2.8  2008/08/31 11:53:23  wolf
+- BR qca-devel >= 2.0.0
+
+Revision 1.50.2.7  2008/08/30 23:09:29  shadzik
+- 4.1.64
+
+Revision 1.50.2.6  2008/08/23 12:46:46  paszczus
+- updated to 4.1.63
+
+Revision 1.50.2.5  2008/08/19 14:16:40  shadzik
+- %files
+
+Revision 1.50.2.4  2008/08/17 22:30:09  shadzik
+- 4.1.62
+
+Revision 1.50.2.3  2008/08/15 11:51:01  shadzik
+- cmake fix now in cmake itself
+
+Revision 1.50.2.2  2008/08/11 10:42:12  paszczus
+- proper md5
+
+Revision 1.50.2.1  2008/08/09 16:41:08  shadzik
+- 4.1.61
 
 Revision 1.50  2008/08/09 16:34:29  shadzik
 - reverted
@@ -727,4 +858,3 @@
 - initial and raw from kdegraphics.spec
 - sorry darekr i couldn't wait for you
 - NFY (needs %files and other stuff too i guess)
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kde4-kdegraphics.spec?r1=1.53&r2=1.54&f=u

More information about the pld-cvs-commit mailing list