Author: shadzik Date: Mon Jul 20 16:12:47 2009 GMT Module: packages Tag: HEAD ---- Log message: - merged from DEVEL
---- Files affected: packages/kde4-oxygen-icons: kde4-oxygen-icons.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: packages/kde4-oxygen-icons/kde4-oxygen-icons.spec diff -u packages/kde4-oxygen-icons/kde4-oxygen-icons.spec:1.4 packages/kde4-oxygen-icons/kde4-oxygen-icons.spec:1.5 --- packages/kde4-oxygen-icons/kde4-oxygen-icons.spec:1.4 Mon Jun 29 21:36:01 2009 +++ packages/kde4-oxygen-icons/kde4-oxygen-icons.spec Mon Jul 20 18:12:42 2009 @@ -2,18 +2,20 @@ # # Conditional build: # -%define state stable +%define state unstable %define orgname oxygen-icons +%define svn 979380 Summary: KDE4 - Oxygen icons Summary(pl.UTF-8): Ikony Oxygen dla KDE4 Name: kde4-oxygen-icons -Version: 4.2.95 +Version: 4.2.96 Release: 1 License: GPL v2 Group: X11/Libraries -Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2 -# Source0-md5: c9641494d128fd04eb09c273b57fc22a +#Source0: ftp://ftp.kde.org/pub/kde/%{state}/%{version}/src/%{orgname}-%{version}svn%{svn}.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/%{state}/%{version}/src/%{orgname}-%{version}.tar.bz2 +# Source0-md5: 95fd0245065f27c8a1f47337310fe9cf URL: http://www.kde.org/ BuildRequires: cmake >= 2.6.1-2 BuildRequires: rpmbuild(macros) >= 1.293 @@ -27,11 +29,11 @@ Ikony Oxygen dla KDE4. %package -n kde4-icons-oxygen -Summary: KDE icons - oxygen -Summary(pl.UTF-8): Motyw ikon do KDE - oxygen -Group: Themes -Obsoletes: kde-icons-oxygen -Provides: kde4-icons +Summary: KDE icons - oxygen +Summary(pl.UTF-8): Motyw ikon do KDE - oxygen +Group: Themes +Provides: kde4-icons +Obsoletes: kde-icons-oxygen %description -n kde4-icons-oxygen KDE icons - oxygen. @@ -40,10 +42,10 @@ Motyw ikon do KDE - oxygen. %package -n kde4-icons-oxygen-svg -Summary: KDE SVG icons - oxygen -Summary(pl.UTF-8): Motyw ikon SVG do KDE - oxygen -Group: Themes -Provides: kde4-icons +Summary: KDE SVG icons - oxygen +Summary(pl.UTF-8): Motyw ikon SVG do KDE - oxygen +Group: Themes +Provides: kde4-icons %description -n kde4-icons-oxygen-svg KDE icons - oxygen. This package contains SVG icons. @@ -52,7 +54,9 @@ Motyw ikon do KDE - oxygen. Ten pakiet zawiera ikony SVG. %prep + %setup -q -n %{orgname}-%{version} +#%setup -q -n %{orgname}-%{version}svn%{svn} %build install -d build @@ -71,6 +75,7 @@ DESTDIR=$RPM_BUILD_ROOT cp -r scalable $RPM_BUILD_ROOT%{_iconsdir}/oxygen/ +install -d $RPM_BUILD_ROOT%{_iconsdir}/oxygen/42x42/{apps,devices,mimetypes,places} %clean rm -rf $RPM_BUILD_ROOT @@ -78,8 +83,6 @@ %files -n kde4-icons-oxygen %defattr(644,root,root,755) # digikam has it's own icon in digikam.spec -%exclude %{_iconsdir}/oxygen/*x*/apps/digikam.* -%exclude %{_iconsdir}/oxygen/*x*/apps/showfoto.* %dir %{_iconsdir}/oxygen/256x256 %dir %{_iconsdir}/oxygen/256x256/apps %dir %{_iconsdir}/oxygen/256x256/categories @@ -87,6 +90,13 @@ %dir %{_iconsdir}/oxygen/256x256/mimetypes %dir %{_iconsdir}/oxygen/256x256/places %dir %{_iconsdir}/oxygen/256x256/status +%dir %{_iconsdir}/oxygen/42x42 +%dir %{_iconsdir}/oxygen/42x42/apps +%dir %{_iconsdir}/oxygen/42x42/devices +%dir %{_iconsdir}/oxygen/42x42/mimetypes +%dir %{_iconsdir}/oxygen/42x42/places +%exclude %{_iconsdir}/oxygen/*x*/apps/digikam.* +%exclude %{_iconsdir}/oxygen/*x*/apps/showfoto.* %{_iconsdir}/oxygen/*x*/actions/* %{_iconsdir}/oxygen/*x*/apps/* %{_iconsdir}/oxygen/*x*/categories/* @@ -121,14 +131,29 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.4 2009/06/29 19:36:01 shadzik -- more +Revision 1.5 2009/07/20 16:12:42 shadzik +- merged from DEVEL + +Revision 1.1.2.7 2009/07/20 16:11:28 shadzik +- more %dirs + +Revision 1.1.2.6 2009/07/09 19:06:17 paszczus +- updated to 4.2.96 + +Revision 1.1.2.5 2009/06/11 13:14:19 paszczus +- added missing %dir + +Revision 1.1.2.4 2009/06/11 12:48:38 paszczus +- updated to 4.2.91 + +Revision 1.1.2.3 2009/05/30 14:19:27 paszczus +- updated to 4.2.88 -Revision 1.3 2009/06/29 19:32:53 shadzik -- %dirs +Revision 1.1.2.2 2009/05/26 13:59:09 paszczus +- added missing dirs -Revision 1.2 2009/06/29 19:30:43 shadzik -- 4.3 RC1 +Revision 1.1.2.1 2009/05/26 13:17:43 paszczus +- updated to 4.2.87 Revision 1.1 2009/03/28 13:18:17 shadzik - init ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-oxygen-icons/kde4-oxygen-icons.spec?r1=1.4&r2=1.5&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
