rpms/oxygen-icon-theme/devel .cvsignore, 1.2, 1.3 oxygen-icon-theme.spec, 1.1, 1.2 sources, 1.2, 1.3

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/oxygen-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28343

Modified Files:
	.cvsignore oxygen-icon-theme.spec sources 
Log Message:
cvs only, no builds yet

* Fri May 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.85-1
- oxygen-icons-4.2.85



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oxygen-icon-theme/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	31 Mar 2009 15:57:58 -0000	1.2
+++ .cvsignore	8 May 2009 17:35:37 -0000	1.3
@@ -1 +1 @@
-kdebase-runtime-4.2.2.tar.bz2
+oxygen-icons-4.2.85.tar.bz2


Index: oxygen-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oxygen-icon-theme/devel/oxygen-icon-theme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- oxygen-icon-theme.spec	31 Mar 2009 15:57:58 -0000	1.1
+++ oxygen-icon-theme.spec	8 May 2009 17:35:37 -0000	1.2
@@ -1,46 +1,31 @@
 
-%define icons_svg 1
-
 Name:          oxygen-icon-theme 
 Summary:       Oxygen icon theme 
-Version:       4.2.2
+Version:       4.2.85
 Release:       1%{?dist}
 
 License:       LGPLv3+ 
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
-Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
+Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/oxygen-icons-%{version}.tar.bz2
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:     noarch
 
-BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: cmake
+BuildRequires: kde-filesystem
 
-# Most of the following deps are bogus in this context, needed only 
-# because we're curerntly building from kdebase-runtime tarball.
-# upstream will provide standalone oxygen-icon-theme tarballs soon.
-BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: OpenEXR-devel
-BuildRequires: openssl-devel
-BuildRequires: pkgconfig
-BuildRequires: pulseaudio-libs-devel
-BuildRequires: qimageblitz-devel
-BuildRequires: soprano-devel
+# some icons moved here in older kdepim's...
+#Conflicts: kdepim < 4.2.85
 
-%{?!icons_svg:Obsoletes: oxygen-icon-theme-scalable < %{version}-%{release}}
+Obsoletes: oxygen-icon-theme-scalable < 4.2.85 
 
 
 %description
 %{summary}.
 
-%package scalable
-Summary: Oxygen icon theme, scalable(svg) icons
-Group: User Interface/Desktops
-Requires: %{name} = %{version}-%{release}
-%description scalable
-%{summary}.
 
 %prep
-%setup -q -n kdebase-runtime-%{version}
+%setup -q -n oxygen-icons-%{version}
 
 
 %build
@@ -49,20 +34,13 @@ pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
+make %{?_smp_mflags} -C %{_target_platform} 
+
 
 %install
 rm -rf %{buildroot}
 
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/pics/oxygen
-
-%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
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %clean
@@ -81,37 +59,17 @@ touch --no-create %{_kde4_iconsdir}/oxyg
 gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 fi
 
-%if 0%{?icons_svg}
-%post scalable
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
-
-%posttrans scalable
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
-
-%postun 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
-
 
-%files %{?icons_svg:-f svg-exclude.list}
+%files 
 %defattr(-,root,root,-)
-%doc pics/oxygen/AUTHORS
-%doc pics/oxygen/CONTRIBUTING
-%doc pics/oxygen/COPYING
-%doc pics/oxygen/TODO*
-#{_kde4_iconsdir}/default.kde4
+%doc AUTHORS CONTRIBUTING COPYING TODO*
 %{_kde4_iconsdir}/oxygen/
 
-%if 0%{?icons_svg}
-%files scalable -f svg-include.list
-%defattr(-,root,root,-)
-%endif
-
 
 %changelog
+* Fri May 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.85-1
+- oxygen-icons-4.2.85
+
 * Tue Mar 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-1
 - kde-4.2.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oxygen-icon-theme/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Mar 2009 15:57:58 -0000	1.2
+++ sources	8 May 2009 17:35:37 -0000	1.3
@@ -1 +1 @@
-cff3fbdb98faeec0ae65d8caea7a5b0f  kdebase-runtime-4.2.2.tar.bz2
+5dd0d81b5de863e41b8a6ec5d2404955  oxygen-icons-4.2.85.tar.bz2