rpms/kdebase-runtime/devel kdebase-runtime-4.2.85-knetattach.patch, NONE, 1.1 kdebase-runtime.spec, 1.112, 1.113 kdebase-runtime-4.1.1-knetattach.patch, 1.1, NONE kdebase-runtime-4.2.2-persistent_notify.patch, 1.1, NONE

Thu May 14 18:48:29 UTC 2009

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8558

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.2.85-knetattach.patch 
Removed Files:
	kdebase-runtime-4.1.1-knetattach.patch 
	kdebase-runtime-4.2.2-persistent_notify.patch 
Log Message:
fixup some patches, remove oxygen-icon crud


kdebase-runtime-4.2.85-knetattach.patch:

--- NEW FILE kdebase-runtime-4.2.85-knetattach.patch ---
diff -up kdebase-runtime-4.2.85/knetattach/knetattach.desktop.knetattach kdebase-runtime-4.2.85/knetattach/knetattach.desktop
--- kdebase-runtime-4.2.85/knetattach/knetattach.desktop.knetattach	2009-03-18 04:58:55.000000000 -0500
+++ kdebase-runtime-4.2.85/knetattach/knetattach.desktop	2009-05-14 13:45:54.980764940 -0500
@@ -102,4 +102,5 @@ Type=Application
 Terminal=false
 X-KDE-StartupNotify=true
 Categories=Qt;KDE;Network;RemoteAccess;
+NoDisplay=true
 X-DocPath=knetattach/index.html


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- kdebase-runtime.spec	13 May 2009 13:36:28 -0000	1.112
+++ kdebase-runtime.spec	14 May 2009 18:47:58 -0000	1.113
@@ -1,3 +1,4 @@
+
 %if 0%{?fedora} < 9
 # # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
 %global kde3_desktop 1
@@ -19,19 +20,10 @@ BuildRoot:     %{_tmppath}/%{name}-%{ver
 
 Patch0:        kdebase-runtime-4.1.70-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
-Patch2:        kdebase-runtime-4.1.1-knetattach.patch
+Patch2:        kdebase-runtime-4.2.85-knetattach.patch
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
 
 ## Upstream patches
-Patch100:       kdebase-runtime-4.2.2-persistent_notify.patch
-
-#ifarch noarch
-## icons now provided by standalone oxygen-icon-theme
-#define icons 1
-#define icons_svg 1
-#else
-%define rest 1
-#endif
 
 # when kdesu was removed, this is/should-be only temporary
 %if 0%{?fedora} < 11
@@ -58,8 +50,6 @@ BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libsmbclient-devel
-# needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
-BuildRequires: libxcb-devel
 BuildRequires: libXScrnSaver-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
@@ -67,7 +57,6 @@ BuildRequires: pkgconfig
 BuildRequires: pulseaudio-libs-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel
-BuildRequires: xine-lib-devel
 # needed?
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
@@ -84,7 +73,7 @@ provided by KDE 3 because of file and co
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-Requires: kdelibs4 >= %{version}
+Requires: kdelibs4%{?_isa} >= %{version}
 Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
@@ -99,25 +88,6 @@ BuildArch: noarch
 %description flags 
 %{summary}.
 
-%package -n oxygen-icon-theme
-Summary: Oxygen icon theme
-Group: User Interface/Desktops
-%{?!icons_svg:Obsoletes: oxygen-icon-theme-scalable < %{version}-%{release}}
-%if 0%{?fedora} > 9
-BuildArch: noarch
-%endif
-%description -n oxygen-icon-theme
-%{summary}.
-
-%package -n oxygen-icon-theme-scalable
-Summary: Oxygen icon theme, scalable(svg) icons
-Group: User Interface/Desktops
-Requires: oxygen-icon-theme = %{version}-%{release}
-%if 0%{?fedora} > 9
-BuildArch: noarch
-%endif
-%description -n oxygen-icon-theme-scalable
-%{summary}.
 
 %prep
 %setup -q -n kdebase-runtime-%{version}
@@ -127,9 +97,6 @@ BuildArch: noarch
 %patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit
 
-# upstream patches
-%patch100 -p2 -b .persistent_knotify
-
 
 %build
 mkdir -p %{_target_platform}
@@ -145,37 +112,16 @@ make %{?_smp_mflags} -C %{_target_platfo
 %install
 rm -rf %{buildroot}
 
-%if 0%{?rest}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # kdesu symlink
 ln -s %{_kde4_libexecdir}/kdesu %{buildroot}%{_kde4_bindir}/kdesu
-%endif
-
-%if 0%{?icons}
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/pics/oxygen
 
-%if ! 0%{?rest}
 ln -sf oxygen %{buildroot}%{_kde4_iconsdir}/default.kde4
-%endif
-%else
-rm -f %{buildroot}%{_kde4_iconsdir}/default.kde4
-rm -rf %{buildroot}%{_kde4_iconsdir}/oxygen
-%endif
 
 # omit hicolor index.theme, use one from hicolor-icon-theme
 rm -f %{buildroot}%{_kde4_iconsdir}/hicolor/index.theme
 
-%if 0%{?icons_svg}
-find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" > svg.list
-sed -e "s|^%{buildroot}||" svg.list > svg-include.list
-sed -e "s|^%{buildroot}|%exclude |" svg.list > svg-exclude.list
-%else
-find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | \
-  xargs --no-run-if-empty rm -fv
-%endif
-
-%if 0%{?rest}
 %if 0%{?kde3_desktop}
 # remove files which conflict with KDE 3
 rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg
@@ -260,8 +206,6 @@ install -p -D %{SOURCE1} %{buildroot}%{_
 # FIXME: -devel type files, omit for now
 rm -vf  %{buildroot}%{_kde4_libdir}/libkwalletbackend.so
 
-%endif
-
 
 %clean
 rm -rf %{buildroot}
@@ -294,36 +238,7 @@ fi
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
-%if 0%{?icons}
-%post -n oxygen-icon-theme
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
-
-%posttrans -n oxygen-icon-theme
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
-
-%postun -n oxygen-icon-theme
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
-fi
-%endif
-
-%if 0%{?icons_svg}
-%post -n oxygen-icon-theme-scalable
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
-%posttrans -n oxygen-icon-theme-scalable
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
-
-%postun -n oxygen-icon-theme-scalable
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
-fi
-%endif
-
-
-%if 0%{?rest}
 %files
 %defattr(-,root,root,-)
 %{_kde4_bindir}/*
@@ -367,7 +282,6 @@ fi
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/kde4/plugins/phonon_platform/
 %{_kde4_libdir}/kde4/plugins/styles/
-%endif
 
 %if 0%{?flags}
 %files flags
@@ -375,18 +289,6 @@ fi
 %{_kde4_datadir}/locale/l10n/*/flag.png
 %endif
 
-%if 0%{?icons}
-%files -n oxygen-icon-theme %{?icons_svg:-f svg-exclude.list}
-%defattr(-,root,root,-)
-%{_kde4_iconsdir}/default.kde4
-%{_kde4_iconsdir}/oxygen/
-
-%if 0%{?icons_svg}
-%files -n oxygen-icon-theme-scalable -f svg-include.list
-%defattr(-,root,root,-)
-%endif
-%endif
-
 
 %changelog
 * Wed May 13 2009 LukÃ¡Å¡ Tinkl <ltinkl at redhat.com> - 4.2.85-1


--- kdebase-runtime-4.1.1-knetattach.patch DELETED ---


--- kdebase-runtime-4.2.2-persistent_notify.patch DELETED ---


