raphgro pushed to egtk (f22). "v3.4 with the new tarball and xfwm4 legacy theme"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Mar 31 14:32:18 UTC 2015


>From 09ae4228176813c8883a057fca9272cc88d69022 Mon Sep 17 00:00:00 2001
From: Raphael Groner <projects.rg at smart.ms>
Date: Tue, 31 Mar 2015 16:24:08 +0200
Subject: v3.4 with the new tarball and xfwm4 legacy theme


diff --git a/.gitignore b/.gitignore
index e1620e0..d41d34c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 /elementary.tar.gz
+/egtk-3.1.tar.gz
+/egtk-3.4.tar.gz
diff --git a/egtk.spec b/egtk.spec
index af8cf9d..8805d99 100644
--- a/egtk.spec
+++ b/egtk.spec
@@ -6,10 +6,11 @@ Version:	3.4
 Release:	2%{?dist}
 Summary:	The %{short_name} (%{full_name}) themes for GTK+2, GTK+3, Metacity and Xfwm4
 
-Group:		User Interface/Desktops
-License:	GPLv2
+License:	GPLv3+
 URL:		https://launchpad.net/%{name}
-Source0:	https://launchpad.net/%{name}/3.x/%{version}/+download/elementary.tar.gz
+Source0:	%{url}/3.x/%{version}/+download/elementary.tar.gz#/%{name}-%{version}.tar.gz
+# with v3.2+ upstream does not provide any xfwm4 files
+Source1:        %{url}/3.x/3.1/+download/elementary.tar.gz#/%{name}-3.1.tar.gz
 
 BuildArch:	noarch	
 
@@ -70,6 +71,9 @@ find . -name '*~' -type f -exec rm -f '{}' \;
 rm -rf .bzr
 # Remove "index.theme"
 rm -f index.theme
+# patch xfwm4 files
+mkdir legacy
+tar -C legacy -xf %{SOURCE1}
 
 
 %build
@@ -77,11 +81,14 @@ rm -f index.theme
 
 
 %install
-for dir in gtk-2.0 gtk-3.0 metacity-1 xfwm4
+for dir in gtk-2.0 gtk-3.0 metacity-1
 do
 	mkdir -p -m755 %{buildroot}%{_datadir}/themes/%{short_name}/$dir
 	cp -pr ./*/$dir/* %{buildroot}%{_datadir}/themes/%{short_name}/$dir
 done
+# legacy stuff
+mkdir -p -m755 %{buildroot}%{_datadir}/themes/%{short_name}/xfwm4
+cp -pr legacy/*/xfwm4/* %{buildroot}%{_datadir}/themes/%{short_name}/xfwm4
 
 
 %files common
@@ -112,6 +119,9 @@ done
 %changelog
 * Tue Mar 31 2015 Raphael Groner <projects.rg at smart.ms> - 3.4-2
 - v3.4 with the new tarball
+- remove deprecated Group: tag
+- upstream switched to GPLv3+
+- keep legacy xfwm4 theme from v3.1
 
 * Tue Mar 31 2015 Raphael Groner <projects.rg at smart.ms> - 3.4-1
 - v3.4
diff --git a/sources b/sources
index 66e6488..b67de0f 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-207f1348e9af91ae361d801846bf7820  elementary.tar.gz
+bc28c1734f7210ebdd927808f2e7397e  egtk-3.1.tar.gz
+207f1348e9af91ae361d801846bf7820  egtk-3.4.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/egtk.git/commit/?h=f22&id=09ae4228176813c8883a057fca9272cc88d69022


More information about the scm-commits mailing list