[mate-themes] update to latest git snapshot from 2014-11-08

Wolfgang Ulbrich raveit65 at fedoraproject.org
Sun Nov 9 20:02:27 UTC 2014


commit e97cffbefe86f81faff505687296650137b55001
Author: raveit65 <chat-to-me at raveit.de>
Date:   Sun Nov 9 21:02:09 2014 +0100

    update to latest git snapshot from 2014-11-08

 .gitignore       |    1 +
 mate-themes.spec |   52 ++++++++++++++++++++--------------------------------
 sources          |    2 +-
 3 files changed, 22 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0e95dd4..ec7c669 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /mate-themes-1.9.1-git20140720-d832073.tar.xz
 /mate-themes-1.9.1-git20140914-503ae60.tar.xz
 /mate-themes-gtk3.14-1.9.1.tar.xz
+/mate-themes-gtk3.14-1.9.2-git20141108-66e3797.tar.xz
diff --git a/mate-themes.spec b/mate-themes.spec
index 45a4937..ae5a79f 100644
--- a/mate-themes.spec
+++ b/mate-themes.spec
@@ -1,36 +1,35 @@
 # Conditional for release and snapshot builds. Uncomment for release-builds.
-%global rel_build 1
+#%%global rel_build 1
 
 # This is needed, because src-url contains branched part of versioning-scheme.
 %global branch 1.9
 
 %global gtk3_ver gtk3.14
 
-%global rel_ver 1.9.1
+%global rel_ver 1.9.2
 
 # Settings used for build from snapshots.
-%{!?rel_build:%global commit e226730c1ec5a945524a2825bf9f8f62e70f728b}
-%{!?rel_build:%global commit_date 2014}
+%{!?rel_build:%global commit 66e37978619c814ca89d526ee6413c604a97a861}
+%{!?rel_build:%global commit_date 20141108}
 %{!?rel_build:%global shortcommit %(c=%{commit};echo ${c:0:7})}
 %{!?rel_build:%global git_ver git%{commit_date}-%{shortcommit}}
 %{!?rel_build:%global git_rel .git%{commit_date}.%{shortcommit}}
-%{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz}
+%{!?rel_build:%global git_tar %{name}-%{gtk3_ver}-%{version}-%{git_ver}.tar.xz}
 
 Name:           mate-themes
 Version:        %{rel_ver}
-#Release:        0.3%{?git_rel}%{?dist}
-Release:        2%{?dist}
+Release:        0.1%{?git_rel}%{?dist}
+#Release:        2%{?dist}
 Summary:        MATE Desktop themes
 License:        GPLv2+
 URL:            http://mate-desktop.org
+BuildArch:      noarch
 
 # for downloading the tarball use 'spectool -g -R mate-themes.spec'
 # Source for release-builds.
 %{?rel_build:Source0:     http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{gtk3_ver}-%{version}.tar.xz}
 # Source for snapshot-builds.
-#%{!?rel_build:Source0:    http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
-
-Patch0:        mate-themes_fix-contrasthigh-icon-theme-name.patch
+%{!?rel_build:Source0:    http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
 
 BuildRequires:  icon-naming-utils
 BuildRequires:  mate-common
@@ -38,23 +37,19 @@ BuildRequires:  mate-icon-theme-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  gdk-pixbuf2-devel
 
-
 Requires:       mate-icon-theme
 Requires:       gtk2-engines
 Requires:       gtk-murrine-engine
 Requires:       gtk-unico-engine
 
-BuildArch:      noarch
-
 %description
 MATE Desktop themes
 
-
 %prep
-#%setup -q%{!?rel_build:n %{name}-%{commit}}
-%setup -q -n %{name}-%{gtk3_ver}-%{version}
-
-%patch0 -p1 -b .contrasthigh-icon-theme
+# for snapshots
+%setup -q%{!?rel_build:n %{name}-%{commit}}
+# for releases
+#%setup -q -n %{name}-%{gtk3_ver}-%{version}
 
 # needed for git snapshots
 NOCONFIGURE=1 ./autogen.sh
@@ -75,12 +70,6 @@ find %{buildroot} -name '*.a' -exec rm -rf {} ';'
 
 %find_lang %{name} --with-gnome --all-name
 
-# needed icons for ContrastHigh
-mkdir -p %{buildroot}%{_datadir}/themes/ContrastHigh/pixmaps
-cp -rf %{buildroot}%{_datadir}/themes/ContrastHighLargePrint/* \
-%{buildroot}%{_datadir}/themes/ContrastHigh/
-sed -i -e 's/^pixmap_path "\/usr\/share\/themes\/ContrastHighLargePrint\/pixmaps"/pixmap_path "\/usr\/share\/themes\/ContrastHigh\/pixmaps"/' %{buildroot}%{_datadir}/themes/ContrastHigh/gtk-2.0/gtkrc
-
 # clean up package
 rm -rf %{buildroot}%{_datadir}/themes/PrintLarge/
 rm -rf %{buildroot}%{_datadir}/themes/Quid/
@@ -89,13 +78,8 @@ rm -rf %{buildroot}%{_datadir}/themes/Reverse/
 rm -rf %{buildroot}%{_datadir}/themes/Simply/
 rm -rf %{buildroot}%{_datadir}/themes/ContrastHighLargePrint/
 rm -rf %{buildroot}%{_datadir}/themes/ContrastHighLargePrintInverse/
-rm -rf %{buildroot}%{_datadir}/themes/ContrastLowLargePrint/
-rm -rf %{buildroot}%{_datadir}/themes/ContrastLow/
-rm -rf %{buildroot}%{_datadir}/themes/ContrastHighInverse/
-rm -rf %{buildroot}%{_datadir}/icons/ContrastHighInverse/
 rm -rf %{buildroot}%{_datadir}/icons/ContrastHighLargePrint/
 rm -rf %{buildroot}%{_datadir}/icons/ContrastHighLargePrintInverse/
-rm -rf %{buildroot}%{_datadir}/icons/ContrastHigh-SVG/
 rm -rf %{buildroot}%{_datadir}/icons/MateLargePrint/
 rm -rf %{buildroot}%{_datadir}/icons/Quid/
 rm -rf %{buildroot}%{_datadir}/icons/Fog/
@@ -105,7 +89,7 @@ rm -rf %{buildroot}%{_datadir}/themes/Atantla/
 
 %post
 for icon_theme in \
-  Fog ;
+  ContrastHigh ;
 do
   /bin/touch --no-create %{_datadir}/icons/${icon_theme} &> /dev/null || :
 done
@@ -113,7 +97,7 @@ done
 %postun
 if [ $1 -eq 0 ]; then
 for icon_theme in \
-  Fog ;
+  ContrastHigh ;
 do
   /bin/touch --no-create %{_datadir}/icons/${icon_theme} &> /dev/null || :
   /usr/bin/gtk-update-icon-cache %{_datadir}/icons/${icon_theme} &> /dev/null || :
@@ -122,7 +106,7 @@ fi
 
 %posttrans
 for icon_theme in \
-  Fog ;
+  ContrastHigh ;
 do
   /usr/bin/gtk-update-icon-cache %{_datadir}/icons/${icon_theme} &> /dev/null || :
 done
@@ -140,11 +124,15 @@ done
 %{_datadir}/themes/TraditionalGreen/
 %{_datadir}/themes/TraditionalOkTest/
 %{_datadir}/themes/ContrastHigh/
+%{_datadir}/themes/ContrastHighInverse/
 %{_datadir}/icons/ContrastHigh/
 %{_datadir}/icons/mate/cursors/
 
 
 %changelog
+* Sun Nov 05 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.9.2-0.1.git20140304.5a900e
+- update to latest git snapshot from 2014-11-08
+
 * Tue Oct 21 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.9.1-2
 - remove all themes which doesn't support GTK3
 
diff --git a/sources b/sources
index db50225..b540ea7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fff9db6ead507e6f14a92242e3fe531e  mate-themes-gtk3.14-1.9.1.tar.xz
+b4fce918d9ed4c4428d3413ce61c85ac  mate-themes-gtk3.14-1.9.2-git20141108-66e3797.tar.xz


More information about the scm-commits mailing list