rpms/kdebase/F-10 .cvsignore, 1.83, 1.84 kdebase.spec, 1.368, 1.369 sources, 1.111, 1.112
Lukas Tinkl
ltinkl at fedoraproject.org
Tue Sep 1 12:55:12 UTC 2009
Author: ltinkl
Update of /cvs/extras/rpms/kdebase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10746/F-10
Modified Files:
.cvsignore kdebase.spec sources
Log Message:
KDE 4.3.1
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/.cvsignore,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- .cvsignore 5 Aug 2009 02:51:47 -0000 1.83
+++ .cvsignore 1 Sep 2009 12:55:11 -0000 1.84
@@ -1,5 +1 @@
-kdebase-4.2.90.tar.bz2
-kdebase-4.2.95.tar.bz2
-kdebase-4.2.96.tar.bz2
-kdebase-4.2.98.tar.bz2
-kdebase-4.3.0.tar.bz2
+kdebase-4.3.1.tar.bz2
Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/kdebase.spec,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -p -r1.368 -r1.369
--- kdebase.spec 5 Aug 2009 02:51:48 -0000 1.368
+++ kdebase.spec 1 Sep 2009 12:55:11 -0000 1.369
@@ -1,6 +1,7 @@
+
Name: kdebase
Summary: K Desktop Environment 4 - Core Files
-Version: 4.3.0
+Version: 4.3.1
Release: 1%{?dist}
Epoch: 6
@@ -24,9 +25,11 @@ Provides: kdebase4 = %{version}-%{relea
Obsoletes: dolphin < 1.0.2-1
Obsoletes: d3lphin
Obsoletes: kdebase4 < %{version}-%{release}
-Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-extras < 6:4.0.0
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: kde-plasma-folderview < 6:4.3.1-1
+Provides: kde-plasma-folderview = %{?epoch:%{epoch}:}%{version}-%{release}
# FIXME: remove BRs which are only needed for stuff now in -runtime
BuildRequires: alsa-lib-devel
@@ -72,23 +75,27 @@ Requires: kdebase-runtime
%description
Core runtime requirements and applications for the K Desktop Environment 4.
-
+%package -n kde-plasma-folderview
+Summary: FolderView plasma applet
+Group: System Environment/Desktop
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+%description -n kde-plasma-folderview
+%{summary}.
%package libs
Summary: Runtime libraries for %{name}
Group: System Environment/Libraries
-Requires: kdelibs4 >= %{version}, kdepimlibs >= %{version}
+Requires: kdelibs4%{?_isa} >= %{version}
+Requires: kdepimlibs%{?_isa} >= %{version}
%description libs
%{summary}.
-
-
%package devel
Group: Development/Libraries
Summary: Development files for %{name}
Provides: kdebase4-devel = %{version}-%{release}
Obsoletes: kdebase4-devel < %{version}-%{release}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: kdelibs4-devel kdepimlibs4-devel
%description devel
%{summary}.
@@ -146,7 +153,6 @@ rm -rf %{buildroot}
%post
-%{!?libs:/sbin/ldconfig}
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
@@ -156,41 +162,51 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
update-desktop-database -q &> /dev/null ||:
%postun
-%{!?libs:/sbin/ldconfig}
if [ $1 -eq 0 ] ; then
- touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
- gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
- touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
- gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
- update-desktop-database -q &> /dev/null ||:
+ touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+ touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+ update-desktop-database -q &> /dev/null ||:
fi
%post libs -p /sbin/ldconfig
+
%postun libs -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%{_kde4_bindir}/*
-%{_kde4_datadir}/applications/kde4/*
+%{_kde4_datadir}/applications/kde4/*.desktop
%{_kde4_appsdir}/*
%{_kde4_datadir}/config.kcfg/*
%{_datadir}/dbus-1/interfaces/*
+%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_datadir}/kde4/services/*
-%{_kde4_datadir}/kde4/servicetypes/*
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/
+%{_kde4_datadir}/kde4/services/kded/*.desktop
+%{_kde4_datadir}/kde4/services/useragentstrings/
+%{_kde4_datadir}/kde4/servicetypes/*.desktop
%{_kde4_docdir}/HTML/en/*
-%{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/kde4/*.so
%exclude %{_kde4_libdir}/kde4/devel/
%{_mandir}/man1/*
-%{_kde4_datadir}/autostart/*
+%{_kde4_datadir}/autostart/*.desktop
%{_kde4_configdir}/*
%{_kde4_datadir}/templates/*
%{_kde4_datadir}/templates/.source/*
-%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_libdir}/libkdeinit4_*.so
%{_kde4_libdir}/libkonsoleprivate.so
+#exclude %{_kde4_datadir}/kde4/services/plasma-applet-folderview.desktop
+#exclude %{_kde4_libdir}/kde4/plasma_applet_folderview.so
+#files -n kde-plasma-folderview
+#defattr(-,root,root,-)
+%{_kde4_datadir}/kde4/services/plasma-applet-folderview.desktop
+%{_kde4_libdir}/kde4/plasma_applet_folderview.so
+
%files libs
%defattr(-,root,root,-)
%{_kde4_libdir}/lib*.so.*
@@ -202,6 +218,14 @@ fi
%changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+- drop/revert kde-plasma-folderview subpkg
+
+* Tue Aug 25 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
+- kde-plasma-folderview subpkg
+- %%?_isa'ify -libs deps
+
* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
- 4.3.0
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/sources,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- sources 5 Aug 2009 02:51:48 -0000 1.111
+++ sources 1 Sep 2009 12:55:11 -0000 1.112
@@ -1 +1 @@
-6de0b96b78504d8f5fcdee819d080fb1 kdebase-4.3.0.tar.bz2
+10dae53739f1e8bd6f5f615443649e4f kdebase-4.3.1.tar.bz2
More information about the scm-commits
mailing list