rpms/nimbus/EL-5 nimbus-0.1.4-stock-icons.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 nimbus.spec, 1.2, 1.3 sources, 1.2, 1.3 nimbus-0.0.17-stock-icons.patch, 1.1, NONE
Christoph Wickert
cwickert at fedoraproject.org
Sun Nov 22 15:55:39 UTC 2009
- Previous message: [pkgdb] cegui: bruno has requested commit
- Next message: rpms/nimbus/F-10 nimbus-0.1.4-stock-icons.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 nimbus.spec, 1.1, 1.2 sources, 1.2, 1.3 nimbus-0.0.17-stock-icons.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cwickert
Update of /cvs/pkgs/rpms/nimbus/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9485/EL-5
Modified Files:
.cvsignore nimbus.spec sources
Added Files:
nimbus-0.1.4-stock-icons.patch
Removed Files:
nimbus-0.0.17-stock-icons.patch
Log Message:
* Sun Nov 22 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.4-1
- Update to 0.1.4
nimbus-0.1.4-stock-icons.patch:
dark-index.theme | 2 -
dark-index.theme.in | 2 -
gtk-engine/gtk-2.0/Makefile.am | 10 ++++-
gtk-engine/gtk-2.0/Makefile.in | 71 ++++++++++++++++++++++++++++++++---------
gtk-engine/gtk-2.0/dark-gtkrc | 2 -
gtk-engine/gtk-2.0/gtkrc | 2 -
gtk-engine/gtk-2.0/iconrc.in | 2 -
gtk-engine/gtk-2.0/light-gtkrc | 2 -
icons/index.theme.in | 10 ++++-
index.theme | 2 -
index.theme.in | 2 -
light-index.theme | 2 -
light-index.theme.in | 2 -
13 files changed, 79 insertions(+), 32 deletions(-)
--- NEW FILE nimbus-0.1.4-stock-icons.patch ---
Nur in nimbus-0.1.4: autom4te.cache.
diff -dur nimbus-0.1.4.orig/dark-index.theme nimbus-0.1.4/dark-index.theme
--- nimbus-0.1.4.orig/dark-index.theme 2009-10-06 15:23:57.000000000 +0200
+++ nimbus-0.1.4/dark-index.theme 2009-11-22 16:41:57.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=X-GNOME-Metatheme
Name=Dark Nimbus
-Comment=Sun Microsystems, Inc. alternative theme
+Comment=OpenSolaris alternative theme for GNOME
Encoding=UTF-8
[X-GNOME-Metatheme]
diff -dur nimbus-0.1.4.orig/dark-index.theme.in nimbus-0.1.4/dark-index.theme.in
--- nimbus-0.1.4.orig/dark-index.theme.in 2009-02-04 16:35:28.000000000 +0100
+++ nimbus-0.1.4/dark-index.theme.in 2009-11-22 16:41:57.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=X-GNOME-Metatheme
_Name=Dark Nimbus
-_Comment=Sun Microsystems, Inc. alternative theme
+_Comment=OpenSolaris alternative theme for GNOME
Encoding=UTF-8
[X-GNOME-Metatheme]
diff -dur nimbus-0.1.4.orig/gtk-engine/gtk-2.0/dark-gtkrc nimbus-0.1.4/gtk-engine/gtk-2.0/dark-gtkrc
--- nimbus-0.1.4.orig/gtk-engine/gtk-2.0/dark-gtkrc 2009-10-06 15:23:42.000000000 +0200
+++ nimbus-0.1.4/gtk-engine/gtk-2.0/dark-gtkrc 2009-11-22 16:00:53.000000000 +0100
@@ -1,5 +1,3 @@
-include "iconrc"
-
style "dark-defaut"
{
diff -dur nimbus-0.1.4.orig/gtk-engine/gtk-2.0/gtkrc nimbus-0.1.4/gtk-engine/gtk-2.0/gtkrc
--- nimbus-0.1.4.orig/gtk-engine/gtk-2.0/gtkrc 2009-10-06 15:23:44.000000000 +0200
+++ nimbus-0.1.4/gtk-engine/gtk-2.0/gtkrc 2009-11-22 16:00:53.000000000 +0100
@@ -1,5 +1,3 @@
-include "iconrc"
-
style "default"
{
bg[NORMAL] = "#e8e9ed"
diff -dur nimbus-0.1.4.orig/gtk-engine/gtk-2.0/iconrc.in nimbus-0.1.4/gtk-engine/gtk-2.0/iconrc.in
--- nimbus-0.1.4.orig/gtk-engine/gtk-2.0/iconrc.in 2009-02-04 16:34:27.000000000 +0100
+++ nimbus-0.1.4/gtk-engine/gtk-2.0/iconrc.in 2009-11-22 03:54:07.000000000 +0100
@@ -1,4 +1,4 @@
-pixmap_path "@prefix@/share/themes/nimbus/gtk-2.0"
+pixmap_path "@prefix@/share/icons/nimbus/24x24/stock"
style "icon-style"
{
stock["gtk-dialog-authentication"] = {{ "dialog_authentication.png",*,*,*}}
diff -dur nimbus-0.1.4.orig/gtk-engine/gtk-2.0/light-gtkrc nimbus-0.1.4/gtk-engine/gtk-2.0/light-gtkrc
--- nimbus-0.1.4.orig/gtk-engine/gtk-2.0/light-gtkrc 2009-10-06 15:23:24.000000000 +0200
+++ nimbus-0.1.4/gtk-engine/gtk-2.0/light-gtkrc 2009-11-22 16:00:51.000000000 +0100
@@ -1,5 +1,3 @@
-include "iconrc"
-
style "default"
{
bg[NORMAL] = "#e8e9ed"
diff -dur nimbus-0.1.4.orig/gtk-engine/gtk-2.0/Makefile.am nimbus-0.1.4/gtk-engine/gtk-2.0/Makefile.am
--- nimbus-0.1.4.orig/gtk-engine/gtk-2.0/Makefile.am 2009-02-04 16:39:20.000000000 +0100
+++ nimbus-0.1.4/gtk-engine/gtk-2.0/Makefile.am 2009-11-22 03:54:07.000000000 +0100
@@ -1,9 +1,13 @@
themedir = $(datadir)/themes/$(PACKAGE)/gtk-2.0
darkthemedir = $(datadir)/themes/dark-$(PACKAGE)/gtk-2.0
lightthemedir = $(datadir)/themes/light-$(PACKAGE)/gtk-2.0
-theme_DATA = gtkrc \
- iconrc \
- dialog_authentication.png \
+theme_DATA = gtkrc
+
+iconrcdir = $(datadir)/icons/$(PACKAGE)
+iconrc_DATA = iconrc
+
+icondir = $(datadir)/icons/$(PACKAGE)/24x24/stock
+icon_DATA = dialog_authentication.png \
dialog_info.png \
dialog_warning.png \
dialog_error.png \
diff -dur nimbus-0.1.4.orig/gtk-engine/gtk-2.0/Makefile.in nimbus-0.1.4/gtk-engine/gtk-2.0/Makefile.in
--- nimbus-0.1.4.orig/gtk-engine/gtk-2.0/Makefile.in 2009-10-09 14:37:47.000000000 +0200
+++ nimbus-0.1.4/gtk-engine/gtk-2.0/Makefile.in 2009-11-22 03:58:20.000000000 +0100
@@ -50,9 +50,12 @@
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(themedir)"
+am__installdirs = "$(DESTDIR)$(icondir)" "$(DESTDIR)$(iconrcdir)" \
+ "$(DESTDIR)$(themedir)"
+iconDATA_INSTALL = $(INSTALL_DATA)
+iconrcDATA_INSTALL = $(INSTALL_DATA)
themeDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(theme_DATA)
+DATA = $(icon_DATA) $(iconrc_DATA) $(theme_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -197,9 +200,11 @@
top_srcdir = @top_srcdir@
darkthemedir = $(datadir)/themes/dark-$(PACKAGE)/gtk-2.0
lightthemedir = $(datadir)/themes/light-$(PACKAGE)/gtk-2.0
-theme_DATA = gtkrc \
- iconrc \
- dialog_authentication.png \
+theme_DATA = gtkrc
+iconrcdir = $(datadir)/icons/$(PACKAGE)
+iconrc_DATA = iconrc
+icondir = $(datadir)/icons/$(PACKAGE)/24x24/stock
+icon_DATA = dialog_authentication.png \
dialog_info.png \
dialog_warning.png \
dialog_error.png \
@@ -342,6 +347,40 @@
clean-libtool:
-rm -rf .libs _libs
+install-iconDATA: $(icon_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
+ @list='$(icon_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ 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=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
+ rm -f "$(DESTDIR)$(icondir)/$$f"; \
+ done
+install-iconrcDATA: $(iconrc_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(iconrcdir)" || $(MKDIR_P) "$(DESTDIR)$(iconrcdir)"
+ @list='$(iconrc_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(iconrcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconrcdir)/$$f'"; \
+ $(iconrcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconrcdir)/$$f"; \
+ done
+
+uninstall-iconrcDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(iconrc_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(iconrcdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(iconrcdir)/$$f"; \
+ done
install-themeDATA: $(theme_DATA)
@$(NORMAL_INSTALL)
test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)"
@@ -396,7 +435,7 @@
check: check-am
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(themedir)"; do \
+ for dir in "$(DESTDIR)$(icondir)" "$(DESTDIR)$(iconrcdir)" "$(DESTDIR)$(themedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -441,7 +480,8 @@
info-am:
-install-data-am: install-data-local install-themeDATA
+install-data-am: install-data-local install-iconDATA \
+ install-iconrcDATA install-themeDATA
install-dvi: install-dvi-am
@@ -475,7 +515,8 @@
ps-am:
-uninstall-am: uninstall-themeDATA
+uninstall-am: uninstall-iconDATA uninstall-iconrcDATA \
+ uninstall-themeDATA
.MAKE: install-am install-strip
@@ -484,12 +525,14 @@
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-data-local install-dvi \
install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip install-themeDATA installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
- ps ps-am uninstall uninstall-am uninstall-themeDATA
+ install-html-am install-iconDATA install-iconrcDATA \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ install-themeDATA installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ uninstall uninstall-am uninstall-iconDATA uninstall-iconrcDATA \
+ uninstall-themeDATA
install-data-local:
diff -dur nimbus-0.1.4.orig/icons/index.theme.in nimbus-0.1.4/icons/index.theme.in
--- nimbus-0.1.4.orig/icons/index.theme.in 2009-02-04 16:35:26.000000000 +0100
+++ nimbus-0.1.4/icons/index.theme.in 2009-11-22 16:41:23.000000000 +0100
@@ -1,7 +1,8 @@
[Icon Theme]
-Name=nimbus
+Name=Nimbus
+Comment=OpenSolaris default Icon Theme
Inherits=Tango
-Directories=12x12/actions,12x12/emblems,12x12/places,16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/places,16x16/mimetypes,16x16/status,192x192/apps,192x192/categories,192x192/devices,192x192/places,192x192/mimetypes,20x20/status,24x24/actions,24x24/animations,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/places,24x24/mimetypes,24x24/status,32x32/actions,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/places,32x32/mimetypes,32x32/status,36x36/actions,36x36/animations,36x36/apps,36x36/categories,36x36/devices,36x36/places,36x36/mimetypes,48x48/actions,48x48/animations,48x48/apps,48x48/categories,48x48/devices,48x48/places,48x48/mimetypes,48x48/status,48x48/emblems,72x72/apps,72x72/categories,72x72/places,72x72/mimetypes,96x96/apps,96x96/categories,96x96/devices,96x96/places,96x96/mimetypes
+Directories=12x12/actions,12x12/emblems,12x12/places,16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/places,16x16/mimetypes,16x16/status,192x192/apps,192x192/categories,192x192/devices,192x192/places,192x192/mimetypes,20x20/status,24x24/actions,24x24/animations,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/places,24x24/mimetypes,24x24/status,24x24/stock,32x32/actions,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/places,32x32/mimetypes,32x32/status,36x36/actions,36x36/animations,36x36/apps,36x36/categories,36x36/devices,36x36/places,36x36/mimetypes,48x48/actions,48x48/animations,48x48/apps,48x48/categories,48x48/devices,48x48/places,48x48/mimetypes,48x48/status,48x48/emblems,72x72/apps,72x72/categories,72x72/places,72x72/mimetypes,96x96/apps,96x96/categories,96x96/devices,96x96/places,96x96/mimetypes
Example=user-desktop
[12x12/actions]
@@ -129,6 +130,11 @@
Context=Status
Type=Fixed
+[24x24/stock]
+Size=24
+Context=Stock
+Type=Fixed
+
[32x32/actions]
Size=32
Context=Actions
diff -dur nimbus-0.1.4.orig/index.theme nimbus-0.1.4/index.theme
--- nimbus-0.1.4.orig/index.theme 2009-10-06 15:23:57.000000000 +0200
+++ nimbus-0.1.4/index.theme 2009-11-22 16:41:57.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=X-GNOME-Metatheme
Name=Nimbus
-Comment=Sun Microsystems, Inc. default theme
+Comment=OpenSolaris default theme for GNOME
Encoding=UTF-8
[X-GNOME-Metatheme]
diff -dur nimbus-0.1.4.orig/index.theme.in nimbus-0.1.4/index.theme.in
--- nimbus-0.1.4.orig/index.theme.in 2009-02-04 16:35:28.000000000 +0100
+++ nimbus-0.1.4/index.theme.in 2009-11-22 16:41:57.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=X-GNOME-Metatheme
_Name=Nimbus
-_Comment=Sun Microsystems, Inc. default theme
+_Comment=OpenSolaris default theme for GNOME
Encoding=UTF-8
[X-GNOME-Metatheme]
diff -dur nimbus-0.1.4.orig/light-index.theme nimbus-0.1.4/light-index.theme
--- nimbus-0.1.4.orig/light-index.theme 2009-10-06 15:23:58.000000000 +0200
+++ nimbus-0.1.4/light-index.theme 2009-11-22 16:41:57.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=X-GNOME-Metatheme
Name=Light Nimbus
-Comment=Sun Microsystems, Inc. alternative theme
+Comment=OpenSolaris alternative theme for GNOME
Encoding=UTF-8
[X-GNOME-Metatheme]
diff -dur nimbus-0.1.4.orig/light-index.theme.in nimbus-0.1.4/light-index.theme.in
--- nimbus-0.1.4.orig/light-index.theme.in 2009-02-04 16:39:24.000000000 +0100
+++ nimbus-0.1.4/light-index.theme.in 2009-11-22 16:41:57.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=X-GNOME-Metatheme
_Name=Light Nimbus
-_Comment=Sun Microsystems, Inc. alternative theme
+_Comment=OpenSolaris alternative theme for GNOME
Encoding=UTF-8
[X-GNOME-Metatheme]
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nimbus/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 9 Sep 2009 15:58:04 -0000 1.2
+++ .cvsignore 22 Nov 2009 15:55:38 -0000 1.3
@@ -1 +1 @@
-nimbus-0.0.17.tar.bz2
+nimbus-0.1.4.tar.bz2
Index: nimbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nimbus/EL-5/nimbus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nimbus.spec 9 Sep 2009 21:12:21 -0000 1.2
+++ nimbus.spec 22 Nov 2009 15:55:39 -0000 1.3
@@ -2,104 +2,103 @@
%{?!rhel:%define rhel 0}
%{?!fedora:%define fedora 0}
-Name: nimbus
-Version: 0.0.17
-Release: 8%{?dist}
-Summary: Desktop theme originally from Sun
-
-Group: User Interface/Desktops
-License: LGPLv2
-
-URL: https://nimbus.dev.java.net/
-# SHA1 0b984715e0c010ce034a32b7ba69e0582be65362
-Source0: http://dlc.sun.com/osol/jds/downloads/extras/nimbus-%{version}.tar.bz2
-Patch0: nimbus-0.0.17-stock-icons.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: icon-naming-utils glib2-devel gtk2-devel
-BuildRequires: intltool automake libtool autoconf
+Name: nimbus
+Version: 0.1.4
+Release: 1%{?dist}
+Summary: Desktop theme originally from Sun
+
+Group: User Interface/Desktops
+License: LGPLv2
+URL: https://nimbus.dev.java.net/
+Source0: http://dlc.sun.com/osol/jds/downloads/extras/nimbus/nimbus-%{version}.tar.bz2
+Patch0: nimbus-0.1.4-stock-icons.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: icon-naming-utils glib2-devel gtk2-devel
%description
-Just a virtual package to collect all Nimbus related components.
+Virtual package to collect all Nimbus related components.
-%package -n nimbus-theme-gnome
-Summary: Desktop theme from Sun
-Group: User Interface/Desktops
-Requires: gtk-nimbus-engine, nimbus-icon-theme, nimbus-metacity-theme
+%package -n nimbus-theme-gnome
+Summary: Desktop theme from Sun
+Group: User Interface/Desktops
+Requires: gtk-nimbus-engine, nimbus-icon-theme, nimbus-metacity-theme
%if 0%{?fedora} >= 10
-BuildArch: noarch
+BuildArch: noarch
%endif
%description -n nimbus-theme-gnome
-The nimbus Theme Pack for Gnome make use of nimbus Metacity theme, nimbus
-gtk2 theme and Icon set. It originates from Opensolaris by Sun.
+The Nimbus theme pack for Gnome make use of Nimbus Metacity theme, Nimbus
+GTK2 theme and icon set. It originates from OpenSolaris by Sun.
+
-%package -n gtk-nimbus-engine
-Summary: Gtk+ engine for %{name}
-Group: User Interface/Desktops
-Requires: gtk2-engines
+%package -n gtk-nimbus-engine
+Summary: Gtk+ engine for %{name}
+Group: User Interface/Desktops
+Requires: gtk2-engines
%description -n gtk-nimbus-engine
-Gtk+ engine for %{name}.
+GTK+ engine for %{name}.
-%package -n nimbus-icon-theme
-Summary: Icons for %{name}
-Group: User Interface/Desktops
+
+%package -n nimbus-icon-theme
+Summary: Icons for %{name}
+Group: User Interface/Desktops
%if 0%{?fedora} >= 10
-BuildArch: noarch
+BuildArch: noarch
%endif
-%if 0%{?fedora} >= 10
-Requires: fedora-logos
-%else
-Requires: redhat-artwork
+%if 0%{?fedora}
+Requires: fedora-logos
+%endif
+%if 0%{?rhel}
+Requires: redhat-artwork
%endif
%description -n nimbus-icon-theme
Icons for %{name}.
-%package -n nimbus-metacity-theme
-Summary: Metacity theme for %{name}
-Group: User Interface/Desktops
+
+%package -n nimbus-metacity-theme
+Summary: Metacity theme for %{name}
+Group: User Interface/Desktops
%if 0%{?fedora} >= 10
-BuildArch: noarch
+BuildArch: noarch
%endif
-Requires: metacity
+Requires: metacity
%description -n nimbus-metacity-theme
Theme for metacity as part of %{name}.
+
%prep
%setup -q -n nimbus-%{version}
-%patch0 -p1 -b .stok-icons
+%patch0 -p1 -b .stock-icons
-echo 'NotificationTheme=nimbus' >> index.theme
-TMPFILE=$(mktemp rpmbuild-nimbus-XXXXXX)
-iconv -f iso-8859-1 -t utf-8 ChangeLog >$TMPFILE
-touch --reference=ChangeLog $TMPFILE
-chmod --reference=ChangeLog $TMPFILE
-mv $TMPFILE ChangeLog
+# convert to utf-8
+iconv --from=ISO-8859-1 --to=UTF-8 ChangeLog > ChangeLog.new && \
+touch -r ChangeLog ChangeLog.new && \
+mv ChangeLog.new ChangeLog
%build
-aclocal --force
-libtoolize --copy --force --automake
-intltoolize --automake --copy --force
-autoconf --force
-automake --copy --add-missing
%configure --disable-static
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-#no-la
+# remove libtool archives
find $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/ \( -name \*.la -o -name \*.a \) -delete
install -Dp -m 0644 index.theme \
$RPM_BUILD_ROOT%{_datadir}/themes/nimbus/index.theme
touch $RPM_BUILD_ROOT%{_datadir}/icons/nimbus/icon-theme.cache
-# removing OpenSolaris branding use start-here.png from Fedora
+# installed due to error in Makefile
+rm -f $RPM_BUILD_ROOT%{_datadir}/themes/nimbus/dark-index.theme
+rm -f $RPM_BUILD_ROOT%{_datadir}/themes/nimbus/light-index.theme
+
+# removing OpenSolaris branding use vendor's start-here.png
%if 0%{?fedora}
%define theme_name Fedora
%else
@@ -115,46 +114,74 @@ find $RPM_BUILD_ROOT%{_datadir}/icons/ni
ln -sf -v $NEWICON $FILENAME
done
+
%clean
rm -rf $RPM_BUILD_ROOT
+
%post
touch --no-create %{_datadir}/icons/nimbus &>/dev/null || :
+
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/nimbus &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/nimbus &>/dev/null || :
fi
+
%posttrans
gtk-update-icon-cache %{_datadir}/icons/nimbus &>/dev/null || :
+
%files -n gtk-nimbus-engine
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING gtk-engine/docs.txt
%{_libdir}/gtk-2.0/*/engines/libnimbus.so
-%{_datadir}/themes/nimbus/gtk-2.0/gtkrc
-%dir %{_datadir}/themes/nimbus/gtk-2.0/
%dir %{_datadir}/themes/nimbus/
+%dir %{_datadir}/themes/nimbus/gtk-2.0/
+%{_datadir}/themes/nimbus/gtk-2.0/gtkrc
+%dir %{_datadir}/themes/dark-nimbus/
+%dir %{_datadir}/themes/dark-nimbus/gtk-2.0/
+%{_datadir}/themes/dark-nimbus/gtk-2.0/gtkrc
+%dir %{_datadir}/themes/light-nimbus/
+%dir %{_datadir}/themes/light-nimbus/gtk-2.0/
+%{_datadir}/themes/light-nimbus/gtk-2.0/gtkrc
+
%files -n nimbus-metacity-theme
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING
-%{_datadir}/themes/nimbus/metacity-1/
%dir %{_datadir}/themes/nimbus/
+%{_datadir}/themes/nimbus/metacity-1/
+%dir %{_datadir}/themes/dark-nimbus/
+%{_datadir}/themes/dark-nimbus/metacity-1/
+%dir %{_datadir}/themes/light-nimbus/
+%{_datadir}/themes/light-nimbus/metacity-1/
+
%files -n nimbus-icon-theme
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING
-%{_datadir}/icons/nimbus/
+%dir %{_datadir}/icons/nimbus/
+%{_datadir}/icons/nimbus/*x*
+%{_datadir}/icons/nimbus/iconrc
%ghost %{_datadir}/icons/nimbus/icon-theme.cache
+
%files -n nimbus-theme-gnome
%defattr(-,root,root,-)
%{_datadir}/themes/nimbus/index.theme
+%{_datadir}/themes/dark-nimbus/index.theme
+%{_datadir}/themes/light-nimbus/index.theme
%changelog
+* Sun Nov 22 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.4-1
+- Update to 0.1.4
+
+* Fri Nov 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.0.17-8.1
+- Remove reference to non existant notification engine (#537161)
+
* Wed Sep 9 2009 Matěj Cepl <mcepl at redhat.com> - 0.0.17-8
- use %%if and build both on RHEL and Fedora.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nimbus/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 9 Sep 2009 15:58:05 -0000 1.2
+++ sources 22 Nov 2009 15:55:39 -0000 1.3
@@ -1 +1 @@
-c338357e3918cf391193b8429cab5975 nimbus-0.0.17.tar.bz2
+329e6937577d54e64fab546b8ec7b2e6 nimbus-0.1.4.tar.bz2
--- nimbus-0.0.17-stock-icons.patch DELETED ---
- Previous message: [pkgdb] cegui: bruno has requested commit
- Next message: rpms/nimbus/F-10 nimbus-0.1.4-stock-icons.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 nimbus.spec, 1.1, 1.2 sources, 1.2, 1.3 nimbus-0.0.17-stock-icons.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list