rpms/kdebase-workspace/devel kdebase-workspace.spec,1.295,1.296
Than Ngo
than at fedoraproject.org
Fri Sep 25 11:16:16 UTC 2009
- Previous message (by thread): rpms/pyfits/devel .cvsignore, 1.3, 1.4 pyfits.spec, 1.7, 1.8 sources, 1.3, 1.4
- Next message (by thread): rpms/python-sysv_ipc/devel import.log, 1.1, 1.2 python-sysv_ipc.spec, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: than
Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19276
Modified Files:
kdebase-workspace.spec
Log Message:
don't include googlegadgets on RHEL
Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -p -r1.295 -r1.296
--- kdebase-workspace.spec 24 Sep 2009 12:20:06 -0000 1.295
+++ kdebase-workspace.spec 25 Sep 2009 11:16:14 -0000 1.296
@@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspa
Name: kdebase-workspace
Version: 4.3.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
License: GPLv2
Group: User Interface/Desktops
@@ -63,7 +63,10 @@ BuildRequires: akonadi-devel
BuildRequires: bluez-libs-devel
BuildRequires: ConsoleKit-devel
BuildRequires: desktop-file-utils
+%if 0%{?fedora}
BuildRequires: google-gadgets-devel >= 0.10.5
+BuildRequires: qedje-devel >= 0.4.0
+%endif
BuildRequires: glib2-devel
BuildRequires: gpsd-devel
BuildRequires: kdelibs4-devel >= %{version}
@@ -84,9 +87,6 @@ BuildRequires: polkit-qt-devel
BuildRequires: qimageblitz-devel
BuildRequires: soprano-devel
BuildRequires: python-devel
-%if 0%{?fedora}
-BuildRequires: qedje-devel >= 0.4.0
-%endif
# used for the Logitech mouse KCM, disabled until #399931 is fixed
# BuildRequires: libusb-devel
@@ -478,12 +478,14 @@ fi
%{_kde4_libdir}/libsystemsettingsview.so
%{_kde4_libdir}/kconf_update_bin/*
%{_mandir}/man1/plasmaengineexplorer.1*
+%if 0%{?fedora}
# googlegadgets
%exclude %{_kde4_libdir}/kde4/plasma_package_ggl.so
%exclude %{_kde4_libdir}/kde4/plasma_scriptengine_ggl.so
%exclude %{_kde4_appsdir}/plasma/plasmoids/ggl_*
%exclude %{_kde4_datadir}/kde4/services/plasma-applet-ggl*
%exclude %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
+%endif
# python widget
%exclude %{_kde4_datadir}/kde4/services/plasma-scriptengine*python.desktop
# akonadi
@@ -558,6 +560,7 @@ fi
%{_kde4_iconsdir}/Oxygen_Zion/
%{_kde4_iconsdir}/Oxygen_Zion_Big/
+%if 0%{?fedora}
%files googlegadgets
%defattr(-,root,root,-)
%{_kde4_libdir}/kde4/plasma_package_ggl.so
@@ -565,6 +568,7 @@ fi
%{_kde4_datadir}/kde4/apps/plasma/plasmoids/ggl_*
%{_kde4_datadir}/kde4/services/plasma-applet-ggl*
%{_kde4_datadir}/kde4/services/*googlegadgets.desktop
+%endif
%if 0%{?with_polkit_09}
%files -n PolicyKit-kde
@@ -596,6 +600,9 @@ fi
%changelog
+* Fri Sep 25 2009 Than Ngo <than at redhat.com> - 4.3.1-7
+- don't include googlegadgets on RHEL
+
* Thu Sep 24 2009 Than Ngo <than at redhat.com> - 4.3.1-6
- rhel cleanup
- Previous message (by thread): rpms/pyfits/devel .cvsignore, 1.3, 1.4 pyfits.spec, 1.7, 1.8 sources, 1.3, 1.4
- Next message (by thread): rpms/python-sysv_ipc/devel import.log, 1.1, 1.2 python-sysv_ipc.spec, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list