kalev pushed to empathy (f22). "Use the symbolic icon from the 3.12.10 tarball"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed May 13 12:33:59 UTC 2015


From 91fbf4b159ce0b97c8bc637d0d88d0a5eaed39ad Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember at gmail.com>
Date: Wed, 13 May 2015 14:25:43 +0200
Subject: Use the symbolic icon from the 3.12.10 tarball


diff --git a/empathy.spec b/empathy.spec
index f26f57c..b24a493 100644
--- a/empathy.spec
+++ b/empathy.spec
@@ -17,7 +17,7 @@
 
 Name:		empathy
 Version:	3.12.10
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 License:	GPLv2+
@@ -25,8 +25,6 @@ URL:		http://live.gnome.org/Empathy
 
 Source0:	http://download.gnome.org/sources/%{name}/3.12/%{name}-%{version}.tar.xz
 Source1:	%{name}-README.ConnectionManagers
-# Backported symbolic icon from upstream
-Source2:	https://git.gnome.org/browse/empathy/plain/data/icons/hicolor_apps_scalable_empathy-symbolic.svg
 
 BuildRequires:	enchant-devel >= %{enchant_version}
 BuildRequires:	iso-codes-devel
@@ -117,10 +115,6 @@ for f in video_overview.png conf_overview.png croom_overview.png; do
   mv $f %{buildroot}%{_datadir}/help/C/empathy/figures
 done
 
-# Install the backported symbolic icon
-mkdir -p  %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
-cp %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/empathy-symbolic.svg
-
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -207,6 +201,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/main.css
 
 %changelog
+* Wed May 13 2015 Kalev Lember <kalevlember at gmail.com> - 3.12.10-2
+- Use the symbolic icon from the 3.12.10 tarball
+
 * Wed May 13 2015 Debarshi Ray <rishi at fedoraproject.org> - 3.12.10-1
 - Update to 3.12.10
 - Drop patches. Fixed upstream.
diff --git a/hicolor_apps_scalable_empathy-symbolic.svg b/hicolor_apps_scalable_empathy-symbolic.svg
deleted file mode 100644
index 508c159..0000000
--- a/hicolor_apps_scalable_empathy-symbolic.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='empathy-symbolic.svg' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' inkscape:version='0.48.2 r9819' version='1.1' width='16.000017' xmlns='http://www.w3.org/2000/svg'>
-  <metadata id='metadata90'>
-    <rdf:RDF>
-      <cc:Work rdf:about=''>
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
-        <dc:title>Gnome Symbolic Icon Theme</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='-50.255443' inkscape:cy='-35.340414' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#555753' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='true' showguides='true' inkscape:snap-bbox='false' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='1381' inkscape:window-maximized='1' inkscape:window-width='2560' inkscape:window-x='1600' inkscape:window-y='27' inkscape:zoom='16'>
-    <inkscape:grid empspacing='2' enabled='true' id='grid4866' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
-  </sodipodi:namedview>
-  <title id='title9167'>Gnome Symbolic Icon Theme</title>
-  <defs id='defs7386'/>
-  <g inkscape:groupmode='layer' id='layer9' inkscape:label='apps' style='display:inline' transform='translate(-183.0227,-175.08839)'>
-    <path inkscape:connector-curvature='0' d='m 186.36647,175.08839 c -1.86075,0 -3.34375,1.483 -3.34375,3.34375 l 0,5.3125 c 0,1.86075 1.483,3.34375 3.34375,3.34375 l 5.65625,0 0,4 3,-4 0.65625,0 c 1.86075,0 3.34375,-1.483 3.34375,-3.34375 l 0,-5.3125 c 0,-1.86075 -1.483,-3.34375 -3.34375,-3.34375 z m 4.65625,2 c 2.20914,0 4,1.79086 4,4 0,2.20914 -1.79086,4 -4,4 -2.20914,0 -4,-1.79086 -4,-4 0,-2.20914 1.79086,-4 4,-4 z m -1.5,1.35937 c -0.27593,0 -0.5,0.31625 -0.5,0.6875 l 0,0.65625 c 0,0.37126 0.22407,0.65625 0.5,0.65625 0.27592,0 0.5,-0.28499 0.5,-0.65625 l 0,-0.65625 c 0,-0.37125 -0.22408,-0.6875 -0.5,-0.6875 z m 3,0 c -0.27593,0 -0.5,0.31625 -0.5,0.6875 l 0,0.65625 c 0,0.37126 0.22499,0.65625 0.5,0.65625 0.27501,0 0.5,-0.28499 0.5,-0.65625 l 0,-0.65625 c 0,-0.37125 -0.22408,-0.6875 -0.5,-0.6875 z m -4.5,2.19869 0,0.81694 c 0,0.36063 0.64206,1.625 2.96875,1.625 2.49531,0 3.03125,-1.16381 3.03125,-1.625 l 0,-0.77275 C 193.54958,181.49459 192.94783,182 190.99147,182 c -2.01112,0 -2.53989,-0.62591 -2.96875,-1.35355 z' id='rect12460' sodipodi:nodetypes='sssscccssssssssssssssssssssassscssscsc' style='fill:#bebebe;fill-opacity:1;stroke:none'/>
-
-  </g>
-</svg>
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/empathy.git/commit/?h=f22&id=91fbf4b159ce0b97c8bc637d0d88d0a5eaed39ad


More information about the scm-commits mailing list