rpms/oxygen-icon-theme/F-11 .cvsignore, 1.2, 1.3 oxygen-icon-theme.spec, 1.1, 1.2 sources, 1.2, 1.3
Rex Dieter
rdieter at fedoraproject.org
Fri Aug 7 12:58:12 UTC 2009
- Previous message: rpms/oxygen-icon-theme/F-10 .cvsignore, 1.2, 1.3 oxygen-icon-theme.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message: rpms/gnome-applet-jalali-calendar/devel .cvsignore, 1.3, 1.4 gnome-applet-jalali-calendar.spec, 1.5, 1.6 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/oxygen-icon-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18693/F-11
Modified Files:
.cvsignore oxygen-icon-theme.spec sources
Log Message:
kde-4.3.0
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oxygen-icon-theme/F-11/.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 7 Aug 2009 12:58:11 -0000 1.3
@@ -1 +1 @@
-kdebase-runtime-4.2.2.tar.bz2
+oxygen-icons-4.3.0.tar.bz2
Index: oxygen-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oxygen-icon-theme/F-11/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 7 Aug 2009 12:58:11 -0000 1.2
@@ -1,46 +1,30 @@
-
-%define icons_svg 1
-
Name: oxygen-icon-theme
Summary: Oxygen icon theme
-Version: 4.2.2
+Version: 4.3.0
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 +33,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 +58,35 @@ 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 || :
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS CONTRIBUTING COPYING TODO*
+%{_kde4_iconsdir}/oxygen/
-%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
+%changelog
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
-%files %{?icons_svg:-f svg-exclude.list}
-%defattr(-,root,root,-)
-%doc pics/oxygen/AUTHORS
-%doc pics/oxygen/CONTRIBUTING
-%doc pics/oxygen/COPYING
-%doc pics/oxygen/TODO*
-#{_kde4_iconsdir}/default.kde4
-%{_kde4_iconsdir}/oxygen/
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-%if 0%{?icons_svg}
-%files scalable -f svg-include.list
-%defattr(-,root,root,-)
-%endif
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+* Mon Jul 13 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
+
+* Fri May 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.85-1
+- oxygen-icons-4.2.85
-%changelog
* 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/F-11/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 7 Aug 2009 12:58:11 -0000 1.3
@@ -1 +1 @@
-cff3fbdb98faeec0ae65d8caea7a5b0f kdebase-runtime-4.2.2.tar.bz2
+26b63e75f9f198f91a022e5f198119bb oxygen-icons-4.3.0.tar.bz2
- Previous message: rpms/oxygen-icon-theme/F-10 .cvsignore, 1.2, 1.3 oxygen-icon-theme.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message: rpms/gnome-applet-jalali-calendar/devel .cvsignore, 1.3, 1.4 gnome-applet-jalali-calendar.spec, 1.5, 1.6 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list