diff --git a/.gitignore b/.gitignore index fa23052..c1eced0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ gnome-icon-theme-2.30.3.tar.bz2 +gnome-icon-theme-2.31.0.tar.bz2 diff --git a/gnome-icon-theme-2.10.1-links.patch b/gnome-icon-theme-2.10.1-links.patch deleted file mode 100644 index 2fc59e0..0000000 --- a/gnome-icon-theme-2.10.1-links.patch +++ /dev/null @@ -1,826 +0,0 @@ ---- gnome-icon-theme-2.10.1/16x16/stock/net/Makefile.am.links 2005-04-12 15:49:29.000000000 -0400 -+++ gnome-icon-theme-2.10.1/16x16/stock/net/Makefile.am 2005-04-12 15:50:22.000000000 -0400 -@@ -69,5 +69,6 @@ - - install-data-local: - $(mkinstalldirs) $(DESTDIR)$(icondir)/../../filesystems -- ln -sf $(icondir)/stock_shared-by-me.png $(DESTDIR)$(icondir)/../../filesystems/gnome-fs-locally-shared.png -- ln -sf $(icondir)/stock_shared-to-me.png $(DESTDIR)$(icondir)/../../filesystems/gnome-fs-share-private.png -+ cd $(DESTDIR)$(icondir) -+ ln -sf stock_shared-by-me.png ../../filesystems/gnome-fs-locally-shared.png -+ ln -sf stock_shared-to-me.png /../../filesystems/gnome-fs-share-private.png ---- gnome-icon-theme-2.10.1/16x16/stock/net/Makefile.in.links 2005-04-12 15:53:22.000000000 -0400 -+++ gnome-icon-theme-2.10.1/16x16/stock/net/Makefile.in 2005-04-12 15:54:21.000000000 -0400 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.8.5 from Makefile.am. -+# Makefile.in generated by automake 1.6.3 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -13,74 +13,67 @@ - # PARTICULAR PURPOSE. - - @SET_MAKE@ -+SHELL = @SHELL@ - - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ -+prefix = @prefix@ -+exec_prefix = @exec_prefix@ -+ -+bindir = @bindir@ -+sbindir = @sbindir@ -+libexecdir = @libexecdir@ -+datadir = @datadir@ -+sysconfdir = @sysconfdir@ -+sharedstatedir = @sharedstatedir@ -+localstatedir = @localstatedir@ -+libdir = @libdir@ -+infodir = @infodir@ -+mandir = @mandir@ -+includedir = @includedir@ -+oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../../.. -+ -+ACLOCAL = @ACLOCAL@ -+AUTOCONF = @AUTOCONF@ -+AUTOMAKE = @AUTOMAKE@ -+AUTOHEADER = @AUTOHEADER@ -+ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd - INSTALL = @INSTALL@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_DATA = @INSTALL_DATA@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_HEADER = $(INSTALL_DATA) --transform = $(program_transform_name) -+transform = @program_transform_name@ - NORMAL_INSTALL = : - PRE_INSTALL = : - POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --subdir = 16x16/stock/net --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__installdirs = "$(DESTDIR)$(icondir)" --iconDATA_INSTALL = $(INSTALL_DATA) --DATA = $(icon_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --ACLOCAL = @ACLOCAL@ -+ -+EXEEXT = @EXEEXT@ -+OBJEXT = @OBJEXT@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ - ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ --AUTOCONF = @AUTOCONF@ --AUTOHEADER = @AUTOHEADER@ --AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ --CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ --CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ --CYGPATH_W = @CYGPATH_W@ - DATADIRNAME = @DATADIRNAME@ --DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --ECHO_C = @ECHO_C@ --ECHO_N = @ECHO_N@ --ECHO_T = @ECHO_T@ --EGREP = @EGREP@ --ENABLE_HICOLOR_CHECK_FALSE = @ENABLE_HICOLOR_CHECK_FALSE@ --ENABLE_HICOLOR_CHECK_TRUE = @ENABLE_HICOLOR_CHECK_TRUE@ --EXEEXT = @EXEEXT@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GMOFILES = @GMOFILES@ - GMSGFMT = @GMSGFMT@ --INSTALL_DATA = @INSTALL_DATA@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -@@ -88,12 +81,8 @@ - INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ - INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ - INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ --INTLTOOL_ICONV = @INTLTOOL_ICONV@ --INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ - INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ - INTLTOOL_MERGE = @INTLTOOL_MERGE@ --INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ --INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ - INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ - INTLTOOL_PERL = @INTLTOOL_PERL@ - INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -@@ -105,68 +94,27 @@ - INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ - INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ - INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ --INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ --INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ --INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ - INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ --LDFLAGS = @LDFLAGS@ --LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ --LTLIBOBJS = @LTLIBOBJS@ --MAKEINFO = @MAKEINFO@ - MKINSTALLDIRS = @MKINSTALLDIRS@ --MSGFMT = @MSGFMT@ --OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ --PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ --PACKAGE_NAME = @PACKAGE_NAME@ --PACKAGE_STRING = @PACKAGE_STRING@ --PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_VERSION = @PACKAGE_VERSION@ --PATH_SEPARATOR = @PATH_SEPARATOR@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ - PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ --SET_MAKE = @SET_MAKE@ --SHELL = @SHELL@ - STRIP = @STRIP@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --XGETTEXT = @XGETTEXT@ --ac_ct_CC = @ac_ct_CC@ --ac_ct_STRIP = @ac_ct_STRIP@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ - am__include = @am__include@ --am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ --bindir = @bindir@ --build_alias = @build_alias@ --datadir = @datadir@ --exec_prefix = @exec_prefix@ --host_alias = @host_alias@ --includedir = @includedir@ --infodir = @infodir@ - install_sh = @install_sh@ --libdir = @libdir@ --libexecdir = @libexecdir@ - localedir = @localedir@ --localstatedir = @localstatedir@ --mandir = @mandir@ --mkdir_p = @mkdir_p@ --oldincludedir = @oldincludedir@ --prefix = @prefix@ --program_transform_name = @program_transform_name@ --sbindir = @sbindir@ --sharedstatedir = @sharedstatedir@ --sysconfdir = @sysconfdir@ --target_alias = @target_alias@ - NULL = -+ - iconsize = 16x16 - category = stock - subtype = net - icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) -+ - icon_DATA = \ - stock_addressbook.png \ - stock_appointment-reminder-excl.png \ -@@ -227,77 +175,57 @@ - stock_video-conferencing.png \ - $(NULL) - -+ - EXTRA_DIST = $(icon_DATA) -+subdir = 16x16/stock/net -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(icon_DATA) -+ -+DIST_COMMON = Makefile.am Makefile.in - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/net/Makefile'; \ -+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu 16x16/stock/net/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - uninstall-info-am: -+iconDATA_INSTALL = $(INSTALL_DATA) - install-iconDATA: $(icon_DATA) - @$(NORMAL_INSTALL) -- test -z "$(icondir)" || $(mkdir_p) "$(DESTDIR)$(icondir)" -+ $(mkinstalldirs) $(DESTDIR)$(icondir) - @list='$(icon_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \ -- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \ -+ echo " $(iconDATA_INSTALL) $$d$$p $(DESTDIR)$(icondir)/$$f"; \ -+ $(iconDATA_INSTALL) $$d$$p $(DESTDIR)$(icondir)/$$f; \ - done - - uninstall-iconDATA: - @$(NORMAL_UNINSTALL) - @list='$(icon_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \ -- rm -f "$(DESTDIR)$(icondir)/$$f"; \ -+ echo " rm -f $(DESTDIR)$(icondir)/$$f"; \ -+ rm -f $(DESTDIR)$(icondir)/$$f; \ - done - tags: TAGS - TAGS: - --ctags: CTAGS --CTAGS: -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @list='$(DISTFILES)'; for file in $$list; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -+ $(mkinstalldirs) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ -@@ -315,10 +243,10 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(icondir)"; do \ -- test -z "$$dir" || $(mkdir_p) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(icondir) -+ - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -330,7 +258,7 @@ - installcheck: installcheck-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: -@@ -338,7 +266,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f Makefile $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -348,15 +276,13 @@ - clean-am: clean-generic mostlyclean-am - - distclean: distclean-am -- -rm -f Makefile -+ - distclean-am: clean-am distclean-generic - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: -@@ -372,38 +298,30 @@ - installcheck-am: - - maintainer-clean: maintainer-clean-am -- -rm -f Makefile -+ - maintainer-clean-am: distclean-am maintainer-clean-generic - - mostlyclean: mostlyclean-am - - mostlyclean-am: mostlyclean-generic - --pdf: pdf-am -- --pdf-am: -- --ps: ps-am -- --ps-am: -- - uninstall-am: uninstall-iconDATA uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic distclean \ -- distclean-generic distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am \ -- install-data-local install-exec install-exec-am \ -- install-iconDATA install-info install-info-am install-man \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ -- uninstall-iconDATA uninstall-info-am -+ distclean-generic distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-data-local \ -+ install-exec install-exec-am install-iconDATA install-info \ -+ install-info-am install-man install-strip installcheck \ -+ installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ uninstall uninstall-am uninstall-iconDATA uninstall-info-am - - - install-data-local: - $(mkinstalldirs) $(DESTDIR)$(icondir)/../../filesystems -- ln -sf $(icondir)/stock_shared-by-me.png $(DESTDIR)$(icondir)/../../filesystems/gnome-fs-locally-shared.png -- ln -sf $(icondir)/stock_shared-to-me.png $(DESTDIR)$(icondir)/../../filesystems/gnome-fs-share-private.png -+ cd $(DESTDIR)$(icondir) -+ ln -sf stock_shared-by-me.png ../../filesystems/gnome-fs-locally-shared.png -+ ln -sf stock_shared-to-me.png /../../filesystems/gnome-fs-share-private.png - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: ---- gnome-icon-theme-2.10.1/24x24/stock/net/Makefile.am.links 2005-04-12 15:51:16.000000000 -0400 -+++ gnome-icon-theme-2.10.1/24x24/stock/net/Makefile.am 2005-04-12 15:51:53.000000000 -0400 -@@ -63,5 +63,6 @@ - - install-data-local: - $(mkinstalldirs) $(DESTDIR)$(icondir)/../../filesystems -- ln -sf $(icondir)/stock_shared-by-me.png $(DESTDIR)$(icondir)/../../filesystems/gnome-fs-locally-shared.png -- ln -sf $(icondir)/stock_shared-to-me.png $(DESTDIR)$(icondir)/../../filesystems/gnome-fs-share-private.png -+ cd $$(DESTDIR)$(icondir) -+ ln -sf stock_shared-by-me.png ../../filesystems/gnome-fs-locally-shared.png -+ ln -sf stock_shared-to-me.png ../../filesystems/gnome-fs-share-private.png ---- gnome-icon-theme-2.10.1/24x24/stock/net/Makefile.in.links 2005-04-12 15:53:37.000000000 -0400 -+++ gnome-icon-theme-2.10.1/24x24/stock/net/Makefile.in 2005-04-12 15:54:23.000000000 -0400 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.8.5 from Makefile.am. -+# Makefile.in generated by automake 1.6.3 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -13,74 +13,67 @@ - # PARTICULAR PURPOSE. - - @SET_MAKE@ -+SHELL = @SHELL@ - - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ -+prefix = @prefix@ -+exec_prefix = @exec_prefix@ -+ -+bindir = @bindir@ -+sbindir = @sbindir@ -+libexecdir = @libexecdir@ -+datadir = @datadir@ -+sysconfdir = @sysconfdir@ -+sharedstatedir = @sharedstatedir@ -+localstatedir = @localstatedir@ -+libdir = @libdir@ -+infodir = @infodir@ -+mandir = @mandir@ -+includedir = @includedir@ -+oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../../.. -+ -+ACLOCAL = @ACLOCAL@ -+AUTOCONF = @AUTOCONF@ -+AUTOMAKE = @AUTOMAKE@ -+AUTOHEADER = @AUTOHEADER@ -+ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd - INSTALL = @INSTALL@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_DATA = @INSTALL_DATA@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_HEADER = $(INSTALL_DATA) --transform = $(program_transform_name) -+transform = @program_transform_name@ - NORMAL_INSTALL = : - PRE_INSTALL = : - POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --subdir = 24x24/stock/net --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__installdirs = "$(DESTDIR)$(icondir)" --iconDATA_INSTALL = $(INSTALL_DATA) --DATA = $(icon_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --ACLOCAL = @ACLOCAL@ -+ -+EXEEXT = @EXEEXT@ -+OBJEXT = @OBJEXT@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ - ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ --AUTOCONF = @AUTOCONF@ --AUTOHEADER = @AUTOHEADER@ --AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ --CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ --CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ --CYGPATH_W = @CYGPATH_W@ - DATADIRNAME = @DATADIRNAME@ --DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --ECHO_C = @ECHO_C@ --ECHO_N = @ECHO_N@ --ECHO_T = @ECHO_T@ --EGREP = @EGREP@ --ENABLE_HICOLOR_CHECK_FALSE = @ENABLE_HICOLOR_CHECK_FALSE@ --ENABLE_HICOLOR_CHECK_TRUE = @ENABLE_HICOLOR_CHECK_TRUE@ --EXEEXT = @EXEEXT@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GMOFILES = @GMOFILES@ - GMSGFMT = @GMSGFMT@ --INSTALL_DATA = @INSTALL_DATA@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -@@ -88,12 +81,8 @@ - INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ - INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ - INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ --INTLTOOL_ICONV = @INTLTOOL_ICONV@ --INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ - INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ - INTLTOOL_MERGE = @INTLTOOL_MERGE@ --INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ --INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ - INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ - INTLTOOL_PERL = @INTLTOOL_PERL@ - INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -@@ -105,68 +94,27 @@ - INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ - INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ - INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ --INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ --INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ --INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ - INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ --LDFLAGS = @LDFLAGS@ --LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ --LTLIBOBJS = @LTLIBOBJS@ --MAKEINFO = @MAKEINFO@ - MKINSTALLDIRS = @MKINSTALLDIRS@ --MSGFMT = @MSGFMT@ --OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ --PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ --PACKAGE_NAME = @PACKAGE_NAME@ --PACKAGE_STRING = @PACKAGE_STRING@ --PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_VERSION = @PACKAGE_VERSION@ --PATH_SEPARATOR = @PATH_SEPARATOR@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ - PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ --SET_MAKE = @SET_MAKE@ --SHELL = @SHELL@ - STRIP = @STRIP@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --XGETTEXT = @XGETTEXT@ --ac_ct_CC = @ac_ct_CC@ --ac_ct_STRIP = @ac_ct_STRIP@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ - am__include = @am__include@ --am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ --bindir = @bindir@ --build_alias = @build_alias@ --datadir = @datadir@ --exec_prefix = @exec_prefix@ --host_alias = @host_alias@ --includedir = @includedir@ --infodir = @infodir@ - install_sh = @install_sh@ --libdir = @libdir@ --libexecdir = @libexecdir@ - localedir = @localedir@ --localstatedir = @localstatedir@ --mandir = @mandir@ --mkdir_p = @mkdir_p@ --oldincludedir = @oldincludedir@ --prefix = @prefix@ --program_transform_name = @program_transform_name@ --sbindir = @sbindir@ --sharedstatedir = @sharedstatedir@ --sysconfdir = @sysconfdir@ --target_alias = @target_alias@ - NULL = -+ - iconsize = 24x24 - category = stock - subtype = net - icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) -+ - icon_DATA = \ - stock_addressbook.png \ - stock_appointment-reminder-excl.png \ -@@ -221,77 +169,57 @@ - stock_video-conferencing.png \ - $(NULL) - -+ - EXTRA_DIST = $(icon_DATA) -+subdir = 24x24/stock/net -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(icon_DATA) -+ -+DIST_COMMON = Makefile.am Makefile.in - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/net/Makefile'; \ -+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu 24x24/stock/net/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - uninstall-info-am: -+iconDATA_INSTALL = $(INSTALL_DATA) - install-iconDATA: $(icon_DATA) - @$(NORMAL_INSTALL) -- test -z "$(icondir)" || $(mkdir_p) "$(DESTDIR)$(icondir)" -+ $(mkinstalldirs) $(DESTDIR)$(icondir) - @list='$(icon_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \ -- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \ -+ echo " $(iconDATA_INSTALL) $$d$$p $(DESTDIR)$(icondir)/$$f"; \ -+ $(iconDATA_INSTALL) $$d$$p $(DESTDIR)$(icondir)/$$f; \ - done - - uninstall-iconDATA: - @$(NORMAL_UNINSTALL) - @list='$(icon_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \ -- rm -f "$(DESTDIR)$(icondir)/$$f"; \ -+ echo " rm -f $(DESTDIR)$(icondir)/$$f"; \ -+ rm -f $(DESTDIR)$(icondir)/$$f; \ - done - tags: TAGS - TAGS: - --ctags: CTAGS --CTAGS: -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @list='$(DISTFILES)'; for file in $$list; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -+ $(mkinstalldirs) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ -@@ -309,10 +237,10 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(icondir)"; do \ -- test -z "$$dir" || $(mkdir_p) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(icondir) -+ - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -324,7 +252,7 @@ - installcheck: installcheck-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: -@@ -332,7 +260,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f Makefile $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -342,15 +270,13 @@ - clean-am: clean-generic mostlyclean-am - - distclean: distclean-am -- -rm -f Makefile -+ - distclean-am: clean-am distclean-generic - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: -@@ -366,38 +292,30 @@ - installcheck-am: - - maintainer-clean: maintainer-clean-am -- -rm -f Makefile -+ - maintainer-clean-am: distclean-am maintainer-clean-generic - - mostlyclean: mostlyclean-am - - mostlyclean-am: mostlyclean-generic - --pdf: pdf-am -- --pdf-am: -- --ps: ps-am -- --ps-am: -- - uninstall-am: uninstall-iconDATA uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic distclean \ -- distclean-generic distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am \ -- install-data-local install-exec install-exec-am \ -- install-iconDATA install-info install-info-am install-man \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ -- uninstall-iconDATA uninstall-info-am -+ distclean-generic distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-data-local \ -+ install-exec install-exec-am install-iconDATA install-info \ -+ install-info-am install-man install-strip installcheck \ -+ installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ uninstall uninstall-am uninstall-iconDATA uninstall-info-am - - - install-data-local: - $(mkinstalldirs) $(DESTDIR)$(icondir)/../../filesystems -- ln -sf $(icondir)/stock_shared-by-me.png $(DESTDIR)$(icondir)/../../filesystems/gnome-fs-locally-shared.png -- ln -sf $(icondir)/stock_shared-to-me.png $(DESTDIR)$(icondir)/../../filesystems/gnome-fs-share-private.png -+ cd $$(DESTDIR)$(icondir) -+ ln -sf stock_shared-by-me.png ../../filesystems/gnome-fs-locally-shared.png -+ ln -sf stock_shared-to-me.png ../../filesystems/gnome-fs-share-private.png - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/gnome-icon-theme-2.13.5.1-missing-comma.patch b/gnome-icon-theme-2.13.5.1-missing-comma.patch deleted file mode 100644 index 93bd796..0000000 --- a/gnome-icon-theme-2.13.5.1-missing-comma.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome-icon-theme-2.13.5.1/index.theme.in.missing-comma 2006-01-23 16:27:43.000000000 -0500 -+++ gnome-icon-theme-2.13.5.1/index.theme.in 2006-01-23 16:28:12.000000000 -0500 -@@ -1,7 +1,7 @@ - [Icon Theme] - _Name=GNOME - _Comment=Default GNOME Theme --Directories=48x48/actions,48x48/apps,48x48/categories,48x48/devices,48x48/emblems,48x48/filesystems,48x48/mimetypes,48x48/places,48x48/status,48x48/stock/code,48x48/stock/document,48x48/stock/generic,48x48/stock/io,48x48/stock/net,24x24/actions,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/filesystems,24x24/mimetypes,24x24/places,24x24/status,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/document,24x24/stock/form,24x24/stock/generic,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/filesystems,16x16/mimetypes,16x16/places,16x16/status16x16/stock/chart,16x16/stock/code,16x16/stock/code,16x16/stock/data,16x16/stock/document,16x16/stock/emoticons,16x16/stock/form,16x16/stock/generic,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,scalable/apps,scalable/devices,scalable/emblems,scalable/mimetypes,scalable/places,scalable/status,scalable/stock/generic -+Directories=48x48/actions,48x48/apps,48x48/categories,48x48/devices,48x48/emblems,48x48/filesystems,48x48/mimetypes,48x48/places,48x48/status,48x48/stock/code,48x48/stock/document,48x48/stock/generic,48x48/stock/io,48x48/stock/net,24x24/actions,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/filesystems,24x24/mimetypes,24x24/places,24x24/status,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/document,24x24/stock/form,24x24/stock/generic,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/filesystems,16x16/mimetypes,16x16/places,16x16/status,16x16/stock/chart,16x16/stock/code,16x16/stock/code,16x16/stock/data,16x16/stock/document,16x16/stock/emoticons,16x16/stock/form,16x16/stock/generic,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,scalable/apps,scalable/devices,scalable/emblems,scalable/mimetypes,scalable/places,scalable/status,scalable/stock/generic - - [48x48/actions] - Size=48 diff --git a/gnome-icon-theme-2.13.7-gnome-spinner.patch b/gnome-icon-theme-2.13.7-gnome-spinner.patch deleted file mode 100644 index 9729a6c..0000000 --- a/gnome-icon-theme-2.13.7-gnome-spinner.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- gnome-icon-theme-2.13.7/index.theme.in.gnome-spinner 2006-02-09 16:26:22.000000000 -0500 -+++ gnome-icon-theme-2.13.7/index.theme.in 2006-02-09 16:26:59.000000000 -0500 -@@ -1,7 +1,7 @@ - [Icon Theme] - _Name=GNOME - _Comment=Default GNOME Theme --Directories=48x48/actions,48x48/apps,48x48/categories,48x48/devices,48x48/emblems,48x48/filesystems,48x48/mimetypes,48x48/places,48x48/status,48x48/stock/code,48x48/stock/document,48x48/stock/generic,48x48/stock/io,48x48/stock/net,24x24/actions,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/filesystems,24x24/mimetypes,24x24/places,24x24/status,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/document,24x24/stock/form,24x24/stock/generic,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/filesystems,16x16/mimetypes,16x16/places,16x16/status,16x16/stock/chart,16x16/stock/code,16x16/stock/code,16x16/stock/data,16x16/stock/document,16x16/stock/emoticons,16x16/stock/form,16x16/stock/generic,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,scalable/apps,scalable/devices,scalable/emblems,scalable/mimetypes,scalable/places,scalable/status,scalable/stock/generic -+Directories=36x36/apps,48x48/actions,48x48/apps,48x48/categories,48x48/devices,48x48/emblems,48x48/filesystems,48x48/mimetypes,48x48/places,48x48/status,48x48/stock/code,48x48/stock/document,48x48/stock/generic,48x48/stock/io,48x48/stock/net,24x24/actions,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/filesystems,24x24/mimetypes,24x24/places,24x24/status,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/document,24x24/stock/form,24x24/stock/generic,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/filesystems,16x16/mimetypes,16x16/places,16x16/status,16x16/stock/chart,16x16/stock/code,16x16/stock/code,16x16/stock/data,16x16/stock/document,16x16/stock/emoticons,16x16/stock/form,16x16/stock/generic,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,scalable/apps,scalable/devices,scalable/emblems,scalable/mimetypes,scalable/places,scalable/status,scalable/stock/generic - - [48x48/actions] - Size=48 -@@ -352,3 +352,8 @@ - Context=Stock - Type=Scalable - -+[36x36/apps] -+Size=36 -+Context=Applications -+Type=Fixed -+ diff --git a/gnome-icon-theme.spec b/gnome-icon-theme.spec index 6ab0f38..27c7001 100644 --- a/gnome-icon-theme.spec +++ b/gnome-icon-theme.spec @@ -1,9 +1,9 @@ Summary: GNOME icon theme Name: gnome-icon-theme -Version: 2.30.3 -Release: 2%{?dist} +Version: 2.31.0 +Release: 1%{?dist} #VCS: git:git://git.gnome.org/gnome-icon-theme -Source0: http://download.gnome.org/sources/gnome-icon-theme/2.30/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/gnome-icon-theme/2.31/%{name}-%{version}.tar.bz2 License: GPL+ BuildArch: noarch Group: User Interface/Desktops @@ -16,9 +16,6 @@ Requires: pkgconfig Requires(posttrans): gtk2 >= 2.6.2 Requires(postun): gtk2 >= 2.6.2 -Patch0: scalable.patch -BuildRequires: automake autoconf intltool - %description This package contains the default icon theme used by the GNOME desktop. @@ -33,9 +30,6 @@ available under old names. %prep %setup -q -%patch0 -p1 -b .scalable - -autoreconf -i -f %build %configure --enable-icon-mapping @@ -87,6 +81,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || : %defattr(-,root,root) %changelog +* Thu Aug 5 2010 Matthias Clasen 2.31.0-1 +- Update to 2.31.0 + * Sun Jun 13 2010 Matthias Clasen 2.30.3-2 - Another attempt to split legacy off diff --git a/scalable.patch b/scalable.patch deleted file mode 100644 index 1d14523..0000000 --- a/scalable.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up gnome-icon-theme-2.30.2.1/Makefile.am.scalable gnome-icon-theme-2.30.2.1/Makefile.am ---- gnome-icon-theme-2.30.2.1/Makefile.am.scalable 2010-05-24 11:18:44.273706947 -0400 -+++ gnome-icon-theme-2.30.2.1/Makefile.am 2010-05-24 11:18:47.682470322 -0400 -@@ -5,7 +5,7 @@ SUBDIRS = po $(SVGSRCDIR) - theme_in_files = index.theme.in.in - theme_DATA = $(theme_in_files:.theme.in.in=.theme) - --THEME_DIRS=$(shell SIZES="$(render_sizes)"; for size in $$SIZES; do for dir in `find $(srcdir)/$(SVGOUTDIR)/$$size/* -type d`; do printf "$$dir,"; done; done | sed -e "s/,$$//g") -+THEME_DIRS=$(shell SIZES="$(render_sizes)"; for size in $$SIZES; do for dir in `find $(srcdir)/$(SVGOUTDIR)/$$size/* -type d`; do printf "$$dir,"; done; done; echo "scalable/actions,scalable/apps,scalable/devices,scalable/emblems,scalable/mimetypes,scalable/places,scalable/status") - - render: Makefile - ($(am__cd) $(SVGSRCDIR) && $(MAKE) $(AM_MAKEFLAGS) render) \ -@@ -16,7 +16,11 @@ render: Makefile - sed -e "s|\@THEME_DIRS\@|$$dirs|g" < $< > $@; \ - for dir in `echo $$dirs | sed -e "s/,/ /g"`; do \ - sizefull="`dirname $$dir`"; \ -- size="`echo $$sizefull | sed -e 's/x.*$$//g'`"; \ -+ if test "$$sizefull" = "scalable"; then \ -+ size="16"; \ -+ else \ -+ size="`echo $$sizefull | sed -e 's/x.*$$//g'`"; \ -+ fi; \ - context="`basename $$dir`"; \ - echo "[$$dir]" >> $@; \ - if test "$$context" = "actions"; then \ -@@ -53,7 +57,11 @@ render: Makefile - echo "Context=Status" >> $@; \ - fi; \ - echo "Size=$$size" >> $@; \ -- if test "$$size" = "256"; then \ -+ if test "$$sizefull" = "scalable"; then \ -+ echo "MinSize=16" >> $@; \ -+ echo "MaxSize=256" >> $@; \ -+ echo "Type=Scalable" >> $@; \ -+ elif test "$$size" = "256"; then \ - echo "MinSize=56" >> $@; \ - echo "MaxSize=512" >> $@; \ - echo "Type=Scalable" >> $@; \ diff --git a/sources b/sources index 0186af5..15c7aec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -77d272e4220c75588418d9bec31eae24 gnome-icon-theme-2.30.3.tar.bz2 +8e727703343d4c18c73c79dd2009f8ed gnome-icon-theme-2.31.0.tar.bz2