SPECS (DEVEL): kde4-kdegraphics.spec - remove C libkipi to allow simulateno...

[glen]

Author: glen                         Date: Sun Dec 28 14:58:56 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- remove C libkipi to allow simulatenous installs
- pkgconfig files to -devel; rel 2

---- Files affected:
SPECS:
   kde4-kdegraphics.spec (1.50.2.31 -> 1.50.2.32) 

---- Diffs:

================================================================
Index: SPECS/kde4-kdegraphics.spec
diff -u SPECS/kde4-kdegraphics.spec:1.50.2.31 SPECS/kde4-kdegraphics.spec:1.50.2.32
--- SPECS/kde4-kdegraphics.spec:1.50.2.31	Mon Dec 15 16:59:01 2008
+++ SPECS/kde4-kdegraphics.spec	Sun Dec 28 15:58:51 2008
@@ -12,7 +12,7 @@
 Summary(pt_BR.UTF-8):	K Desktop Environment - Aplicações gráficas
 Name:		kde4-kdegraphics
 Version:	4.1.85
-Release:	1
+Release:	2
 License:	GPL
 Group:		X11/Applications/Graphics
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
@@ -352,7 +352,6 @@
 Summary:	kipi libary
 Summary(pl.UTF-8):	Biblioteka kipi
 Group:		X11/Libraries
-Conflicts:	libkipi
 Obsoletes:	kde4-kipiplugins
 
 %description -n kde4-libkipi
@@ -423,6 +422,9 @@
 %{_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
@@ -546,7 +548,6 @@
 #%dir %{_libdir}/libkdcraw6
 #%attr(755,root,root) %{_libdir}/libkdcraw6/kdcraw
 #%{_libdir}/libkdcraw6/CAMERALIST
-%{_pkgconfigdir}/libkdcraw.pc
 %{_datadir}/apps/libkdcraw
 %{_iconsdir}/hicolor/*x*/apps/kdcraw.png
 
@@ -554,13 +555,11 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %ghost %{_libdir}/libkexiv2.so.?
 %attr(755,root,root) %{_libdir}/libkexiv2.so.*.*.*
-%{_pkgconfigdir}/libkexiv2.pc
 
 %files -n kde4-libkipi
 %defattr(644,root,root,755)
 %attr(755,root,root) %ghost %{_libdir}/libkipi.so.?
 %attr(755,root,root) %{_libdir}/libkipi.so.*.*.*
-%{_pkgconfigdir}/libkipi.pc
 %{_datadir}/apps/kipi
 %{_iconsdir}/hicolor/*x*/apps/kipi.png
 %{_iconsdir}/hicolor/16x16/actions/black-white.png
@@ -574,6 +573,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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
 
@@ -601,7 +604,7 @@
 
 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)
+  (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
@@ -833,4 +836,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.50.2.31&r2=1.50.2.32&f=u