rpms/nimbus/devel import.log, NONE, 1.1 nimbus-0.0.17-stock-icons.patch, NONE, 1.1 nimbus.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Matej Cepl mcepl at fedoraproject.org
Wed Aug 5 08:00:52 UTC 2009 

Author: mcepl

Update of /cvs/pkgs/rpms/nimbus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1472/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log nimbus-0.0.17-stock-icons.patch nimbus.spec 
Log Message:
Initial commit.



--- NEW FILE import.log ---
nimbus-0_0_17-6_fc11:HEAD:nimbus-0.0.17-6.fc11.src.rpm:1249459136

nimbus-0.0.17-stock-icons.patch:
 gtk-engine/gtk-2.0/Makefile.am |   12 ++++++++----
 gtk-engine/gtk-2.0/gtkrc       |    2 --
 gtk-engine/gtk-2.0/iconrc      |    2 +-
 gtk-engine/gtk-2.0/iconrc.in   |    2 +-
 icons/index.theme.in           |    7 ++++++-
 5 files changed, 16 insertions(+), 9 deletions(-)

--- NEW FILE nimbus-0.0.17-stock-icons.patch ---
diff -dur nimbus-0.0.17.orig/gtk-engine/gtk-2.0/gtkrc nimbus-0.0.17/gtk-engine/gtk-2.0/gtkrc
--- nimbus-0.0.17.orig/gtk-engine/gtk-2.0/gtkrc	2008-04-08 14:20:00.000000000 +0200
+++ nimbus-0.0.17/gtk-engine/gtk-2.0/gtkrc	2009-07-08 00:28:04.000000000 +0200
@@ -1,5 +1,3 @@
-include "iconrc"
-
 style "default"
 {
   bg[NORMAL]        = "#d6d9df"
diff -dur nimbus-0.0.17.orig/gtk-engine/gtk-2.0/iconrc nimbus-0.0.17/gtk-engine/gtk-2.0/iconrc
--- nimbus-0.0.17.orig/gtk-engine/gtk-2.0/iconrc	2008-08-14 11:18:46.000000000 +0200
+++ nimbus-0.0.17/gtk-engine/gtk-2.0/iconrc	2009-07-08 00:28:04.000000000 +0200
@@ -1,4 +1,4 @@
-pixmap_path "/usr/local/share/themes/nimbus/gtk-2.0"
+pixmap_path "/usr/local/share/icons/nimbus/24x24/stock"
 style "icon-style"
 {
    stock["gtk-dialog-authentication"] =  {{ "dialog_authentication.png",*,*,*}}
diff -dur nimbus-0.0.17.orig/gtk-engine/gtk-2.0/iconrc.in nimbus-0.0.17/gtk-engine/gtk-2.0/iconrc.in
--- nimbus-0.0.17.orig/gtk-engine/gtk-2.0/iconrc.in	2007-03-21 12:37:25.000000000 +0100
+++ nimbus-0.0.17/gtk-engine/gtk-2.0/iconrc.in	2009-07-08 00:28:04.000000000 +0200
@@ -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.0.17.orig/gtk-engine/gtk-2.0/Makefile.am nimbus-0.0.17/gtk-engine/gtk-2.0/Makefile.am
--- nimbus-0.0.17.orig/gtk-engine/gtk-2.0/Makefile.am	2007-03-21 12:37:25.000000000 +0100
+++ nimbus-0.0.17/gtk-engine/gtk-2.0/Makefile.am	2009-07-26 02:16:55.000000000 +0200
@@ -1,7 +1,11 @@
 themedir = $(datadir)/themes//$(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  \
@@ -99,5 +103,5 @@
 		zoom-in.png  \
 		zoom-out.png  
 
-EXTRA_DIST = $(theme_DATA)    \
+EXTRA_DIST = $(iconrc_DATA)    \
 	     iconrc.in	      
diff -dur nimbus-0.0.17.orig/icons/index.theme.in nimbus-0.0.17/icons/index.theme.in
--- nimbus-0.0.17.orig/icons/index.theme.in	2007-10-05 10:17:20.000000000 +0200
+++ nimbus-0.0.17/icons/index.theme.in	2009-07-08 00:28:04.000000000 +0200
@@ -1,7 +1,7 @@
 [Icon Theme]
 Name=nimbus
 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 +129,11 @@
 Context=Status
 Type=Fixed
 
+[24x24/stock]
+Size=24
+Context=Stock
+Type=Fixed
+
 [32x32/actions]
 Size=32
 Context=Actions


--- NEW FILE nimbus.spec ---
Name:      nimbus
Version:   0.0.17
Release:   6%{?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

%description
Just a 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
BuildArch: noarch

%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.

%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}.

%package -n nimbus-icon-theme
Summary: Icons for %{name}
Group: User Interface/Desktops
BuildArch: noarch
Requires: fedora-logos

%description -n nimbus-icon-theme
Icons for %{name}.

%package -n nimbus-metacity-theme
Summary: Metacity theme for %{name}
Group: User Interface/Desktops
BuildArch: noarch
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

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


%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
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
find $RPM_BUILD_ROOT%{_datadir}/icons/nimbus/ -name start-here.png \
     |while read FILENAME ; do
            NEWICON=$(echo $FILENAME \
            |sed -e "s!$RPM_BUILD_ROOT.*nimbus\(.*\)\$!\.\./\.\./\.\./Fedora\1!")
			  	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/

%files -n nimbus-metacity-theme
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING
%{_datadir}/themes/nimbus/metacity-1/
%dir %{_datadir}/themes/nimbus/

%files -n nimbus-icon-theme
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING
%{_datadir}/icons/nimbus/
%ghost %{_datadir}/icons/nimbus/icon-theme.cache

%files -n nimbus-theme-gnome
%defattr(-,root,root,-)
%{_datadir}/themes/nimbus/index.theme

%changelog
* Wed Aug  5 2009 Matěj Cepl <mcepl at redhat.com> - 0.0.17-6
- remove OpenSolaris branding
- add Requires for fedora-logos to nimbus-icon-theme

* Tue Aug  4 2009 Matěj Cepl <mcepl at redhat.com> - 0.0.17-5
- new version of nimbus-0.0.17-stock-icons.patch
- remove another unnecessary %%dir in %%files

* Sat May 16 2009 matej <mcepl at redhat.com> 0.0.17-4
- reogrganization of subpackages
- many changes in %%files

* Mon Apr 20 2009 Matej Cepl <mcepl at redhat.com> 0.0.17-3
- Packaging Review fixes

* Thu Mar 12 2009 Matej Cepl <mcepl at redhat.com> 0.0.17-2
- Fix License tag.

* Mon Mar 02 2009 Matej Cepl <mcepl at redhat.com> 0.0.17-1
- Initial affert to package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nimbus/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 06:14:19 -0000	1.1
+++ .cvsignore	5 Aug 2009 08:00:51 -0000	1.2
@@ -0,0 +1 @@
+nimbus-0.0.17.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nimbus/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 06:14:19 -0000	1.1
+++ sources	5 Aug 2009 08:00:51 -0000	1.2
@@ -0,0 +1 @@
+c338357e3918cf391193b8429cab5975  nimbus-0.0.17.tar.bz2

More information about the fedora-extras-commits mailing list