[gnome-themes-standard] Fix filelists and remove adwaita-gtk3-theme package
Richard Hughes
rhughes at fedoraproject.org
Thu Jun 26 15:19:13 UTC 2014
commit b171d6ebb107287e7589069376daaf078476fdc2
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Jun 26 16:19:06 2014 +0100
Fix filelists and remove adwaita-gtk3-theme package
gnome-themes-standard.spec | 16 +++-------------
settings.ini | 7 -------
2 files changed, 3 insertions(+), 20 deletions(-)
---
diff --git a/gnome-themes-standard.spec b/gnome-themes-standard.spec
index ee99005..9337c1d 100644
--- a/gnome-themes-standard.spec
+++ b/gnome-themes-standard.spec
@@ -10,7 +10,6 @@ Group: User Interface/Desktops
License: LGPLv2+
URL: http://git.gnome.org/browse/gnome-themes-standard
Source0: http://download.gnome.org/sources/%{name}/3.13/%{name}-%{version}.tar.xz
-Source1: settings.ini
Source2: gtkrc
Obsoletes: fedora-gnome-theme <= 15.0-1.fc15
@@ -19,6 +18,9 @@ Provides: fedora-gnome-theme = 1:%{version}-%{release}
Obsoletes: gnome-background-standard < 3.0.0-2
Provides: gnome-background-standard = %{version}-%{release}
+Obsoletes: adwaita-gtk3-theme < 3.13.1-4
+Provides: adwaita-gtk3-theme = %{version}-%{release}
+
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: gtk3-devel >= %{gtk3_version}
BuildRequires: librsvg2-devel
@@ -68,12 +70,8 @@ for t in HighContrast; do
touch $RPM_BUILD_ROOT%{_datadir}/icons/$t/icon-theme.cache
done
-rm $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/3.0.0/theming-engines/libadwaita.la
rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.10.0/engines/libadwaita.la
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-3.0
-cp $RPM_SOURCE_DIR/settings.ini $RPM_BUILD_ROOT%{_datadir}/gtk-3.0/settings.ini
-
mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-2.0
cp $RPM_SOURCE_DIR/gtkrc $RPM_BUILD_ROOT%{_datadir}/gtk-2.0/gtkrc
@@ -110,14 +108,6 @@ done
# Default gtk2 settings
%{_datadir}/gtk-2.0/gtkrc
-%files -n adwaita-gtk3-theme
-# gtk3 Theme and engine
-%{_libdir}/gtk-3.0/3.0.0/theming-engines/libadwaita.so
-%{_datadir}/themes/Adwaita/gtk-3.0
-# Default gtk3 settings
-%{_datadir}/gtk-3.0/settings.ini
-
-
%changelog
* Thu Jun 26 2014 Richard Hughes <rhughes at redhat.com> - 3.13.3-1
- Update to 3.13.3
More information about the scm-commits
mailing list