rpms/nimbus/EL-5 nimbus.spec,1.1,1.2
Matej Cepl
mcepl at fedoraproject.org
Wed Sep 9 21:12:23 UTC 2009
- Previous message (by thread): rpms/selinux-policy/devel .cvsignore, 1.184, 1.185 modules-minimum.conf, 1.31, 1.32 modules-targeted.conf, 1.140, 1.141 nsadiff, 1.21, 1.22 policy-F12.patch, 1.75, 1.76 selinux-policy.spec, 1.914, 1.915 sources, 1.203, 1.204
- Next message (by thread): rpms/nimbus/devel nimbus.spec,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mcepl
Update of /cvs/pkgs/rpms/nimbus/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25834
Modified Files:
nimbus.spec
Log Message:
Universal .spec both for RHEL and Fedora
Index: nimbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nimbus/EL-5/nimbus.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nimbus.spec 9 Sep 2009 15:58:05 -0000 1.1
+++ nimbus.spec 9 Sep 2009 21:12:21 -0000 1.2
@@ -1,6 +1,10 @@
+# Define Variables that must exist
+%{?!rhel:%define rhel 0}
+%{?!fedora:%define fedora 0}
+
Name: nimbus
Version: 0.0.17
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Desktop theme originally from Sun
Group: User Interface/Desktops
@@ -22,7 +26,10 @@ Just a virtual package to collect all Ni
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
+%endif
+
%description -n nimbus-theme-gnome
The nimbus Theme Pack for Gnome make use of nimbus Metacity theme, nimbus
@@ -39,8 +46,14 @@ Gtk+ engine for %{name}.
%package -n nimbus-icon-theme
Summary: Icons for %{name}
Group: User Interface/Desktops
+%if 0%{?fedora} >= 10
BuildArch: noarch
-#Requires: fedora-logos
+%endif
+%if 0%{?fedora} >= 10
+Requires: fedora-logos
+%else
+Requires: redhat-artwork
+%endif
%description -n nimbus-icon-theme
Icons for %{name}.
@@ -48,7 +61,9 @@ Icons for %{name}.
%package -n nimbus-metacity-theme
Summary: Metacity theme for %{name}
Group: User Interface/Desktops
+%if 0%{?fedora} >= 10
BuildArch: noarch
+%endif
Requires: metacity
%description -n nimbus-metacity-theme
@@ -81,16 +96,24 @@ 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
+ $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
+# removing OpenSolaris branding use start-here.png from Fedora
+%if 0%{?fedora}
+%define theme_name Fedora
+%else
+%define theme_name Bluecurve
+%endif
+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\(.*\)\$!\.\./\.\./\.\./%{theme_name}\1!")
+%if 0%{?rhel}
+ NEWICON=$(echo $NEWICON|sed -e 's/places/mimetypes/')
+%endif
+ ln -sf -v $NEWICON $FILENAME
+ done
%clean
rm -rf $RPM_BUILD_ROOT
@@ -132,8 +155,8 @@ gtk-update-icon-cache %{_datadir}/icons/
%{_datadir}/themes/nimbus/index.theme
%changelog
-* Wed Sep 9 2009 Matěj Cepl <mcepl at redhat.com> - 0.0.17-7
-- put back OpenSolaris branding before we figure how to do this platform free.
+* Wed Sep 9 2009 Matěj Cepl <mcepl at redhat.com> - 0.0.17-8
+- use %%if and build both on RHEL and Fedora.
* Wed Aug 5 2009 Matěj Cepl <mcepl at redhat.com> - 0.0.17-6
- remove OpenSolaris branding
- Previous message (by thread): rpms/selinux-policy/devel .cvsignore, 1.184, 1.185 modules-minimum.conf, 1.31, 1.32 modules-targeted.conf, 1.140, 1.141 nsadiff, 1.21, 1.22 policy-F12.patch, 1.75, 1.76 selinux-policy.spec, 1.914, 1.915 sources, 1.203, 1.204
- Next message (by thread): rpms/nimbus/devel nimbus.spec,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list