Attachment 152715 Details for Bug 236633 – specfile patch

[patch] specfile patch

redhat-artwork.spec.patch (text/plain), 3.40 KB, created by Rex Dieter on 2007-04-16 21:01:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rex Dieter

Created: 2007-04-16 21:01:58 UTC

Size: 3.40 KB

patch

obsolete

>? make.i386
>? post-install-fixup.sh
>? redhat-artwork-5.0.12-kde.patch
>? redhat-artwork.spec.patc
>Index: redhat-artwork.spec
>===================================================================
>RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
>retrieving revision 1.177
>diff -u -3 -p -u -r1.177 redhat-artwork.spec
>--- redhat-artwork.spec	4 Apr 2007 13:30:31 -0000	1.177
>+++ redhat-artwork.spec	16 Apr 2007 18:14:24 -0000
>@@ -1,10 +1,13 @@
>+
>+# define to include kde widget/styles
>+#define kde 1
> %define qtdir qt-3.3
> %define po_package redhat-artwork
> 
> Summary: Artwork for Red Hat default look-and-feel
> Name: redhat-artwork
> Version: 5.0.12
>-Release: 3%{?dist} 
>+Release: 4%{?dist} 
> URL: http://www.redhat.com
> Source0: %{name}-%{version}.tar.gz
> Source1: post-install-fixup.sh
>@@ -13,21 +16,22 @@ Source3: icon-coverage-linker.py
> Source4: coverage-tool-links.xml
> Patch0: redhat-artwork-5.0.5-add-dirs-to-bluecurve-theme-index.patch
> Patch1: redhat-artwork-5.0.11-lowres-mode-fix.patch
>+Patch2: redhat-artwork-5.0.12-kde.patch
> Group: User Interface/Desktops
> License: GPL
> BuildRoot: %{_tmppath}/%{name}-root
>-Conflicts: qt < 1:3.0.4-11
> Conflicts: gtk-engines < 0.11-13
> Conflicts: gnome-session <= 2.0.1-3
>-Conflicts: kdebase <= 6:3.0.3-1
>+%{?kde:Conflicts: qt < 1:3.0.4-11}
>+%{?kde:Conflicts: kdebase <= 6:3.0.3-1}
> Conflicts: gdm <= 2.6.0.8-5
> Conflicts: redhat-menus < 5.5.5
> # we don't want to require gtk/qt
> Autoreq: 0
> 
> BuildRequires: gtk2-devel >= 2.9.0
>-#BuildRequires: qt-devel >= 1:3.3.4-10
>-BuildRequires: kdebase-devel >= 3.2.0
>+BuildRequires: qt-devel >= 1:3.3.4-10
>+%{?kde:BuildRequires: kdebase-devel >= 3.2.0}
> BuildRequires: xorg-x11-apps
> BuildRequires: icon-slicer >= 0.3-6
> BuildRequires: netpbm-progs
>@@ -49,8 +53,6 @@ Conflicts: redhat-logos < 4.9.3
> # for gtk-update-icon-cache
> Requires(post): gtk2 >= 2.9.0
> 
>-# Required for mcopidl in configure, but we don't use that...
>-BuildRequires: arts-devel
> 
> %description
> redhat-artwork contains the themes and icons that make up the Red Hat default 
>@@ -64,9 +66,16 @@ look and feel.
> mkdir post-install
> (cd post-install; tar xzvf %{SOURCE2})
> 
>+%if "%{?kde}" != "1"
>+%patch2 -p1 -b .kde
>+%endif
>+
> autoreconf
>+
>+
> %build
> 
>+%if "%{?kde}" == "1"
> ## this is apparently how Qt finds itself.
> ## they need pkg-config gospel.
> unset QTDIR
>@@ -74,6 +83,7 @@ echo "Trying to source qt.sh"
> . /etc/profile.d/qt.sh
> echo "QTDIR is $QTDIR"
> export QTDIR
>+%endif
> 
> export LANG=en_US.ISO-8859-1 ## workaround for intltool sucking in UTF-8
> %configure
>@@ -368,10 +378,13 @@ pushd $RPM_BUILD_ROOT%{_datadir}/icons/B
> popd
> 
> # save some space
>+%if "%{?kde}" == "1"
> pushd $RPM_BUILD_ROOT%{_datadir}/apps/kdm/themes/FedoraFlyingHigh
>   rm -f background.jpg
>   ln -s ../../../../gdm/themes/FedoraFlyingHigh/background.jpg .
> popd
>+%endif
>+
> 
> %clean
> rm -rf $RPM_BUILD_ROOT
>@@ -393,17 +406,20 @@ done
> %{_datadir}/gdm/themes/*
> %{_datadir}/icons
> %ghost %{_datadir}/icons/Bluecurve/icon-theme.cache
>-%{_datadir}/apps
> %{_datadir}/pixmaps
> %{_datadir}/xmms
>-%{_libdir}/kde3
>+%{?kde:%{_libdir}/kde3}
>+%{?kde:%{_datadir}/apps/kdm/themes/Bluecurve}
> %{_libdir}/gtk-2.0
> %{_libdir}/%{qtdir}
>-%{_datadir}/apps/kdm/themes/Bluecurve
> %dir %{_sysconfdir}/gtk-2.0
> %config %{_sysconfdir}/gtk-2.0/gtkrc
> 
>+
> %changelog
>+* Fri Apr 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 5.0.12-4
>+- omit kde style/widgets (for now)
>+
> * Wed Apr 04 2007 Than Ngo <than@redhat.com> - 5.0.12-3
> - fix broken symlink
>

Actions: View | Diff

Attachments on bug 236633: 152715 | 152716