- rel 4

- add 160x160 hierarchy (orage)
- move adding random dirs to a generic solution via patch

Changed files:
    hicolor-icon-theme-more-dirs.patch -> 1.1
    hicolor-icon-theme.spec -> 1.24

diff --git a/hicolor-icon-theme-more-dirs.patch b/hicolor-icon-theme-more-dirs.patch
new file mode 100644 (file)
index 0000000..c20786b
--- /dev/null
+++ b/hicolor-icon-theme-more-dirs.patch
@@ -0,0 +1,16 @@
+--- hicolor-icon-theme-0.12/Makefile.in.orig   2010-01-13 11:18:27.000000000 +0100
++++ hicolor-icon-theme-0.12/Makefile.in        2011-09-28 14:12:14.430478446 +0200
+@@ -9,10 +9,10 @@
+ distdir = $(PACKAGE)-$(VERSION)
+ FILES = README Makefile.in configure.ac configure install-sh index.theme ChangeLog COPYING
+ 
+-ICON_SIZES = 16x16 22x22 24x24 32x32 36x36 48x48 64x64 72x72 96x96 \
+-  128x128 192x192 256x256 scalable
++ICON_SIZES = 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 96x96 \
++  128x128 160x160 192x192 256x256 scalable
+ ICON_CONTEXTS = actions animations apps categories devices emblems emotes filesystems intl mimetypes places status stock
+-STOCK_SUBS = chart code data form image io media navigation net object table text
++STOCK_SUBS = chart code data emoticons form image io media navigation net object table text
+ 
+ all:
+       @:

diff --git a/hicolor-icon-theme.spec b/hicolor-icon-theme.spec
index 89d62adc26e88447feb3b0413c7a64955e3c03e2..3d2b67d83f67669b4e62179d1dbc85bdc08954c0 100644 (file)
--- a/hicolor-icon-theme.spec
+++ b/hicolor-icon-theme.spec
@@ -2,11 +2,12 @@ Summary:      Directory hierarchy for default icon theme
 Summary(pl.UTF-8):     Struktura katalogów dla domyślnego motywu ikon
 Name:          hicolor-icon-theme
 Version:       0.12
-Release:       3
+Release:       4
 License:       LGPL
 Group:         Base
 Source0:       http://icon-theme.freedesktop.org/releases/%{name}-%{version}.tar.gz
 # Source0-md5: 55cafbcef8bcf7107f6d502149eb4d87
+Patch0:                %{name}-more-dirs.patch
 URL:           http://icon-theme.freedesktop.org/wiki/HicolorTheme
 # Conflicts:   gnome-icon-theme < 1.0.9
 Conflicts:     kdelibs < 9:3.2.0-4
@@ -21,6 +22,7 @@ Struktura katalogów dla domyślnego motywu ikon.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -32,11 +34,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-# added in Revision 1.11
-install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/16x16/stock/emoticons
-install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/8x8/devices
-install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/42x42/devices
-
 # gtk+2 cache
 touch $RPM_BUILD_ROOT%{_iconsdir}/hicolor/icon-theme.cache