Author: shadzik Date: Sun Mar 9 01:02:39 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- adjusted Rs in subpackages
- some cosmetics
---- Files affected:
SPECS:
kde4-kdesdk.spec (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SPECS/kde4-kdesdk.spec
diff -u SPECS/kde4-kdesdk.spec:1.3 SPECS/kde4-kdesdk.spec:1.4
--- SPECS/kde4-kdesdk.spec:1.3 Sun Mar 9 01:55:58 2008
+++ SPECS/kde4-kdesdk.spec Sun Mar 9 02:02:33 2008
@@ -27,7 +27,6 @@
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.213
BuildRequires: subversion-devel >= 0.37.0
-Obsoletes: kdesdk-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _gimpdir %(gimptool --gimpdatadir 2>/dev/null)
@@ -46,7 +45,7 @@
Summary: Developers' file formats enhanced information
Summary(pl.UTF-8): Rozszerzone informacje o plikach używanych przez
programistów
Group: X11/Development/Libraries
-Requires: konqueror >= %{_minbaseevr}
+Requires: kde4-konqueror >= %{version}
%description kfile
This package adds a tab to konqueror "file properties" dialog window
@@ -61,10 +60,9 @@
Summary: A KDE CVS frontend
Summary(pl.UTF-8): Frontend do CVS dla KDE
Group: X11/Development/Tools
-Requires: %{name}-libcvsservice = %{epoch}:%{version}-%{release}
+#Requires: %{name}-libcvsservice = %{version}-%{release}
Requires: cvs-client >= 1.10
-Requires: kdebase-core >= %{_minbaseevr}
-Conflicts: kdesdk-scripts-cvs < 3:3.3.0-1
+Requires: kde4-kdebase-core >= %(version}
%description cervisia
A KDE CVS frontend. It features:
@@ -147,8 +145,7 @@
Summary: A kdeaccounts plugin for the KDE PIM framework
Summary(pl.UTF-8): Wtyczka do książki adresowej KDE dodająca obsługę
kdeaccounts
Group: X11/Applications
-Requires: kdepim-kaddressbook >= 3.0.8
-Obsoletes: kaddressbook-kdeaccounts
+Requires: kde4-kdepim-kaddressbook >= %{version}
%description kde-resource-kdeaccounts
A kdeaccounts plugin for the KDE adressbook. It allows adding the
@@ -162,7 +159,7 @@
Summary: A bugzilla plugin for the KDE PIM framework
Summary(pl.UTF-8): Wtyczka do książki adresowej KDE dodająca obsługę
bugzilli
Group: X11/Applications
-Requires: kdepim-kaddressbook >= 3.0.8
+Requires: kde4-kdepim-kaddressbook >= %{version}
%description kde-resource-bugzilla
A KDE PIM plugin that allows creating bugzilla TODO lists.
@@ -222,7 +219,6 @@
Summary: Kompare - a program to view the differences between files
Summary(pl.UTF-8): Kompare - program służący do porównywania zmian między
plikami
Group: X11/Development/Tools
-Conflicts: kdesdk-kbugbuster < 3:3.2.90.040517-3
%description kompare
Kompare is a program to view the differences between files. Features
@@ -272,8 +268,6 @@
Summary: A utility for egzamining the internal state of a Qt/KDE
application
Summary(pl.UTF-8): Narzędzie do badania stanu aplikacji Qt/KDE
Group: X11/Development/Tools
-Obsoletes: kdiff
-Obsoletes: kdiff2
%description kspy
KSpy is a utility intended to help developers examine the internal
@@ -330,8 +324,7 @@
Summary: A cvs access library
Summary(pl.UTF-8): Biblioteka dostępu do cvs
Group: X11/Libraries
-Requires: kdelibs >= %{_minlibsevr}
-Conflicts: kdesdk-cervisia < 3:3.2.90.040516-2
+Requires: kde4-kdelibs >= %{version}
%description libcvsservice
A library for access to CVS repositories for KDE apps.
@@ -344,8 +337,7 @@
Summary: A cvsservice library - header files
Summary(pl.UTF-8): Biblioteka cvsservice - pliki nagłówkowe
Group: X11/Development/Libraries
-Requires: %{name}-libcvsservice = %{epoch}:%{version}-%{release}
-Obsoletes: kdesdk-cervisia-devel
+Requires: %{name}-libcvsservice = %{version}-%{release}
%description libcvsservice-devel
A cvsservice library - header files.
@@ -358,7 +350,6 @@
Summary(pl.UTF-8): Pakiet dodający domyślną paletę kolorów KDE do GIMP-a
Group: X11/Applications/Graphics
Requires: gimp
-Obsoletes: kdesdk-pallette-gimp
%description palette-gimp
This package adds the KDE Default palette to GIMP.
@@ -372,7 +363,6 @@
Group: X11/Applications/Graphics
Requires: xorg-lib-libXt >= 1.0
Requires: xpaint
-Obsoletes: kdesdk-pallette-xpaint
%description palette-xpaint
This package adds the KDE Default palette to XPaint.
@@ -397,14 +387,6 @@
Summary(pl.UTF-8): Zestaw skryptów do kompilowania i utrzymywania KDE
Group: X11/Development/Tools
Requires: /usr/bin/perl
-Obsoletes: kdesdk-extractrc
-Obsoletes: kdesdk-scripts-build
-Obsoletes: kdesdk-scripts-cxxmetric
-Obsoletes: kdesdk-scripts-extractrc
-Obsoletes: kdesdk-scripts-findmissingcrystal
-Obsoletes: kdesdk-scripts-kdelnk2desktop
-Obsoletes: kdesdk-scripts-misc
-Obsoletes: kdesdk-scripts-zonetab2pot
%description scripts-developer
This package contains:
@@ -543,7 +525,7 @@
Summary: SVN protocol service
Summary(pl.UTF-8): Obsługa protokołu SVN
Group: X11/Libraries
-Requires: kdelibs >= %{_minlibsevr}
+Requires: kde4-kdelibs >= %{version}
%description -n kde-kio-svn
SVN protocol service.
@@ -555,8 +537,6 @@
Summary: KDE Advanced Text Editor
Summary(pl.UTF-8): Zaawansowany edytor tekstu dla KDE
Group: X11/Applications/Editors
-Obsoletes: kate
-Conflicts: kttsd <= 040609
%description kate
KDE advanced text editor featuring among others:
@@ -606,16 +586,14 @@
%cmake \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
../
-%{__make} -j1
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d \
- $RPM_BUILD_ROOT%{_gimpdir}/palettes \
- $RPM_BUILD_ROOT%{_appdefsdir}
+install -d $RPM_BUILD_ROOT{%{_gimpdir}/palettes,%{_appdefsdir}}
-%{__make} -C build/ install \
+%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT \
kde_htmldir=%{_kdedocdir}
@@ -648,8 +626,8 @@
%post kstartperf -p /sbin/ldconfig
%postun kstartperf -p /sbin/ldconfig
-%post libcvsservice -p /sbin/ldconfig
-%postun libcvsservice -p /sbin/ldconfig
+#%post libcvsservice -p /sbin/ldconfig
+#%postun libcvsservice -p /sbin/ldconfig
%files cervisia -f cervisia.lang
%defattr(644,root,root,755)
@@ -970,6 +948,10 @@
* %{date} PLD Team <[EMAIL PROTECTED]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.4 2008-03-09 01:02:33 shadzik
+- adjusted Rs in subpackages
+- some cosmetics
+
Revision 1.3 2008-03-09 00:55:58 shadzik
- BRs
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kde4-kdesdk.spec?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
