chkr pushed to anki (f22). "Update to new upstream version 2.0.32 (BZ 1205471) (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Apr 7 20:37:01 UTC 2015


>From 89c3057e12560d867089675e2695d0fe32948904 Mon Sep 17 00:00:00 2001
From: Christian Krause <chkr at fedoraproject.org>
Date: Mon, 6 Apr 2015 02:15:32 +0200
Subject: Update to new upstream version 2.0.32 (BZ 1205471)

- Move icon to %{_datadir}/icons/hicolor/scalable/apps
- Modify svg icon to use only the subset of the SVG specification
  which is implemented by Qt's SVG library
- Add keywords to desktop file

diff --git a/.gitignore b/.gitignore
index ff4421c..1eed3d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ anki-1.0.1.tgz
 /anki-2.0.26.tgz
 /anki-2.0.28.tgz
 /anki-2.0.31.tgz
+/anki-2.0.32.tgz
diff --git a/anki.spec b/anki.spec
index 17cfc3f..09ce303 100644
--- a/anki.spec
+++ b/anki.spec
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		anki
-Version:	2.0.31
+Version:	2.0.32
 Release:	1%{?dist}
 Summary:	Flashcard program for using space repetition learning
 
@@ -16,6 +16,7 @@ Source2:	anki.appdata.xml
 Patch0:		anki-2.0.3-noupdate.patch
 BuildRequires:	python2-devel, python-setuptools, python-sqlalchemy
 BuildRequires:	desktop-file-utils, PyQt4, python-simplejson
+Requires:	hicolor-icon-theme
 Requires:	qt4, PyQt4
 Requires:	python-sqlalchemy, python-simplejson
 Requires:	python-matplotlib
@@ -57,8 +58,8 @@ install -m 644 README* %{buildroot}%{_pkgdocdir}/
 install -d %{buildroot}%{_datadir}/mime/packages
 install -m 644 anki.xml %{buildroot}%{_datadir}/mime/packages
 
-install -d %{buildroot}%{_datadir}/pixmaps
-install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/
+install -d %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
+install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
 
 install -d %{buildroot}%{_mandir}/man1
 install -m 644 anki.1 %{buildroot}%{_mandir}/man1/
@@ -68,6 +69,7 @@ install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/appdata/
 
 desktop-file-install \
   --remove-category=KDE \
+  --set-key=Keywords --set-value="learn;education;memorizing;language;flashcard;spaced repetition;" \
   --dir %{buildroot}%{_datadir}/applications \
   %{name}.desktop
 
@@ -86,16 +88,20 @@ s:\(.*\):%dir \1:' >>anki.lang
 %post
 /bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
 /usr/bin/update-desktop-database &> /dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
 /usr/bin/update-desktop-database &> /dev/null || :
 if [ $1 -eq 0 ] ; then
   /bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
   /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
+  /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+  /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 %posttrans
 /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
+/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}.lang
 %doc LICENSE.* README*
@@ -106,12 +112,19 @@ fi
 %{_datadir}/%{name}/anki/
 %{_datadir}/%{name}/thirdparty/
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/pixmaps/%{name}.*
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.*
 %{_datadir}/mime/packages/anki.xml
 %{_mandir}/man1/%{name}.*
 %{_datadir}/appdata/anki.appdata.xml
 
 %changelog
+* Sun Apr 05 2015 Christian Krause <chkr at fedoraproject.org> - 2.0.32-1
+- Update to new upstream version 2.0.32 (BZ 1205471)
+- Move icon to %%{_datadir}/icons/hicolor/scalable/apps
+- Modify svg icon to use only the subset of the SVG specification
+  which is implemented by Qt's SVG library
+- Add keywords to desktop file
+
 * Mon Nov 03 2014 Christian Krause <chkr at fedoraproject.org> - 2.0.31-1
 - Update to new upstream version 2.0.31 (BZ 1144973)
 
diff --git a/anki.svg b/anki.svg
index ecd7797..7a24e83 100644
--- a/anki.svg
+++ b/anki.svg
@@ -14,23 +14,10 @@
    height="33"
    id="svg3652"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="New document 10">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="anki.svg">
   <defs
      id="defs3654">
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath2815">
-      <rect
-         style="fill:#d533e4;fill-opacity:0.54098361;stroke:none"
-         id="rect1913"
-         width="23"
-         height="30"
-         x="5"
-         y="1"
-         ry="4.6187186"
-         rx="4.6187186" />
-    </clipPath>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3769"
@@ -124,6 +111,64 @@
        id="linearGradient3698"
        xlink:href="#linearGradient4843"
        inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3769"
+       id="linearGradient3094"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.954545,0,0,0.965517,1.704545,0.551724)"
+       x1="15.5"
+       y1="5.9497476"
+       x2="4"
+       y2="31" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4825"
+       id="linearGradient3096"
+       gradientUnits="userSpaceOnUse"
+       x1="253.74718"
+       y1="412.82977"
+       x2="188.00023"
+       y2="542.33295" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4825"
+       id="linearGradient3098"
+       gradientUnits="userSpaceOnUse"
+       x1="253.74718"
+       y1="412.82977"
+       x2="188.00023"
+       y2="542.33295" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4843"
+       id="linearGradient3100"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.09240924,0,0,0.09240924,-5.65772,-25.6423)"
+       x1="247"
+       y1="441.86218"
+       x2="292"
+       y2="282.36218" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4843"
+       id="linearGradient3103"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.09240924,0,0,0.09240924,-5.65772,-25.1423)"
+       x1="247"
+       y1="441.86218"
+       x2="292"
+       y2="282.36218" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3769"
+       id="linearGradient3109"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.954545,0,0,0.965517,1.704545,1020.4139)"
+       x1="15.5"
+       y1="5.9497476"
+       x2="4"
+       y2="31" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -132,17 +177,18 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.272727"
-     inkscape:cx="16.5"
-     inkscape:cy="16.5"
+     inkscape:zoom="22.627417"
+     inkscape:cx="7.6663386"
+     inkscape:cy="15.935691"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="953"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1145"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false" />
   <metadata
      id="metadata3657">
     <rdf:RDF>
@@ -160,83 +206,72 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1019.3622)">
-    <g
-       style="display:inline"
-       id="g2807"
-       clip-path="url(#clipPath2815)"
-       transform="translate(0,1019.8622)">
-      <rect
-         ry="0"
-         rx="0"
-         y="0"
-         x="0"
-         height="32"
-         width="32"
-         id="rect2802"
-         style="fill:#000000;fill-opacity:1;stroke:none;display:inline" />
-      <rect
-         style="fill:url(#linearGradient2973);fill-opacity:1;stroke:none"
-         id="rect4875"
-         width="21"
-         height="28"
-         x="6"
-         y="2"
-         ry="4"
-         rx="4" />
-      <path
-         transform="matrix(0.09169279,0.01148462,-0.01148462,0.09169279,1.24989,-28.62005)"
-         d="m 312.50679,544.32837 c -20.28396,20.1643 -45.83498,-32.08006 -74.19864,-28.40036 -29.32333,3.80421 -41.202,60.28859 -67.50841,46.78663 -25.44547,-13.06007 16.34617,-53.50493 4.08171,-79.34329 -12.67942,-26.71258 -70.06997,-20.55523 -65.35797,-49.74645 4.55778,-28.23586 55.93746,-0.9878 76.72126,-20.63649 21.48703,-20.31349 -2.10362,-72.99241 27.11497,-77.53162 28.26233,-4.39065 18.22508,52.89443 43.33464,66.58923 25.95913,14.15816 68.76986,-24.55656 82.11594,1.82928 12.9093,25.52229 -44.67374,33.67836 -49.93898,61.7909 -5.4434,29.06371 44.60573,57.81562 23.63548,78.66217 z"
-         inkscape:randomized="0"
-         inkscape:rounded="0.36"
-         inkscape:flatsided="false"
-         sodipodi:arg2="1.4167054"
-         sodipodi:arg1="0.81345017"
-         sodipodi:r2="60.646587"
-         sodipodi:r1="121.55363"
-         sodipodi:cy="456"
-         sodipodi:cx="229"
-         sodipodi:sides="5"
-         id="path4877"
-         style="fill:none;stroke:none"
-         sodipodi:type="star" />
-      <path
-         sodipodi:type="star"
-         style="fill:url(#linearGradient2975);fill-opacity:1;stroke:#ffffff;stroke-width:15.98369503;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path4879"
-         sodipodi:sides="5"
-         sodipodi:cx="229"
-         sodipodi:cy="456"
-         sodipodi:r1="94"
-         sodipodi:r2="52"
-         sodipodi:arg1="0.80032243"
-         sodipodi:arg2="1.428641"
-         inkscape:flatsided="false"
-         inkscape:rounded="0.21"
-         inkscape:randomized="0"
-         d="m 294.46869,523.45259 c -9.08043,8.81335 -45.57491,-17.76993 -58.10148,-15.97712 -12.52658,1.79282 -40.09949,37.54547 -51.28749,31.63294 -11.18801,-5.91252 2.81678,-48.83551 -2.75921,-60.19499 -5.57599,-11.35947 -48.09928,-26.53469 -45.93342,-39.00218 2.16586,-12.46749 47.31577,-12.41208 56.39619,-21.22544 9.08043,-8.81335 10.3725,-53.9448 22.89908,-55.73762 12.52657,-1.79281 26.42597,41.16443 37.61397,47.07695 11.188,5.91252 54.50984,-6.80503 60.08583,4.55445 5.57599,11.35947 -30.98363,37.85309 -33.14948,50.32059 -2.16586,12.46749 23.31643,49.73906 14.23601,58.55242 z"
-         transform="matrix(0.07507522,4.398431e-4,-4.398431e-4,0.07507522,-2.36792,-12.92398)" />
-      <path
-         transform="matrix(0.03131375,-0.02522366,0.02522366,0.03131375,2.32085,0.206819)"
-         d="m 294.46869,523.45259 c -9.08043,8.81335 -45.57491,-17.76993 -58.10148,-15.97712 -12.52658,1.79282 -40.09949,37.54547 -51.28749,31.63294 -11.18801,-5.91252 2.81678,-48.83551 -2.75921,-60.19499 -5.57599,-11.35947 -48.09928,-26.53469 -45.93342,-39.00218 2.16586,-12.46749 47.31577,-12.41208 56.39619,-21.22544 9.08043,-8.81335 10.3725,-53.9448 22.89908,-55.73762 12.52657,-1.79281 26.42597,41.16443 37.61397,47.07695 11.188,5.91252 54.50984,-6.80503 60.08583,4.55445 5.57599,11.35947 -30.98363,37.85309 -33.14948,50.32059 -2.16586,12.46749 23.31643,49.73906 14.23601,58.55242 z"
-         inkscape:randomized="0"
-         inkscape:rounded="0.21"
-         inkscape:flatsided="false"
-         sodipodi:arg2="1.428641"
-         sodipodi:arg1="0.80032243"
-         sodipodi:r2="52"
-         sodipodi:r1="94"
-         sodipodi:cy="456"
-         sodipodi:cx="229"
-         sodipodi:sides="5"
-         id="path4889"
-         style="fill:url(#linearGradient2977);fill-opacity:1;stroke:#ffffff;stroke-width:24.86989784;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="star" />
-      <path
-         style="fill:url(#linearGradient3698);fill-opacity:1;stroke:none;display:inline"
-         d="m 2.659112,0.45056835 27.630363,0 L 29.457792,20.39883 C 25.879683,16.517642 12.825421,10.535309 3.6153,10.535309 L 2.659112,0.45056835 z"
-         id="path4881"
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0" />
-    </g>
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none;display:inline"
+       d="M 9.625 1.5 C 7.0662299 1.5 5 3.5662299 5 6.125 L 5 26.875 C 5 29.43377 7.0662299 31.5 9.625 31.5 L 23.375 31.5 C 25.93377 31.5 28 29.43377 28 26.875 L 28 6.125 C 28 3.5662299 25.93377 1.5 23.375 1.5 L 9.625 1.5 z "
+       transform="translate(0,1019.3622)"
+       id="rect2802" />
+    <rect
+       rx="4"
+       ry="4"
+       y="1021.8622"
+       x="6"
+       height="28"
+       width="21"
+       id="rect4875"
+       style="fill:url(#linearGradient3109);fill-opacity:1;stroke:none" />
+    <path
+       sodipodi:type="star"
+       style="fill:none;stroke:none"
+       id="path4877"
+       sodipodi:sides="5"
+       sodipodi:cx="229"
+       sodipodi:cy="456"
+       sodipodi:r1="121.55363"
+       sodipodi:r2="60.646587"
+       sodipodi:arg1="0.81345017"
+       sodipodi:arg2="1.4167054"
+       inkscape:flatsided="false"
+       inkscape:rounded="0.36"
+       inkscape:randomized="0"
+       d="m 312.50679,544.32837 c -20.28396,20.1643 -45.83498,-32.08006 -74.19864,-28.40036 -29.32333,3.80421 -41.202,60.28859 -67.50841,46.78663 -25.44547,-13.06007 16.34617,-53.50493 4.08171,-79.34329 -12.67942,-26.71258 -70.06997,-20.55523 -65.35797,-49.74645 4.55778,-28.23586 55.93746,-0.9878 76.72126,-20.63649 21.48703,-20.31349 -2.10362,-72.99241 27.11497,-77.53162 28.26233,-4.39065 18.22508,52.89443 43.33464,66.58923 25.95913,14.15816 68.76986,-24.55656 82.11594,1.82928 12.9093,25.52229 -44.67374,33.67836 -49.93898,61.7909 -5.4434,29.06371 44.60573,57.81562 23.63548,78.66217 z"
+       transform="matrix(0.09169279,0.01148462,-0.01148462,0.09169279,1.24989,991.24215)" />
+    <path
+       transform="matrix(0.07507522,4.398431e-4,-4.398431e-4,0.07507522,-2.36792,1006.9382)"
+       d="m 294.46869,523.45259 c -9.08043,8.81335 -45.57491,-17.76993 -58.10148,-15.97712 -12.52658,1.79282 -40.09949,37.54547 -51.28749,31.63294 -11.18801,-5.91252 2.81678,-48.83551 -2.75921,-60.19499 -5.57599,-11.35947 -48.09928,-26.53469 -45.93342,-39.00218 2.16586,-12.46749 47.31577,-12.41208 56.39619,-21.22544 9.08043,-8.81335 10.3725,-53.9448 22.89908,-55.73762 12.52657,-1.79281 26.42597,41.16443 37.61397,47.07695 11.188,5.91252 54.50984,-6.80503 60.08583,4.55445 5.57599,11.35947 -30.98363,37.85309 -33.14948,50.32059 -2.16586,12.46749 23.31643,49.73906 14.23601,58.55242 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0.21"
+       inkscape:flatsided="false"
+       sodipodi:arg2="1.428641"
+       sodipodi:arg1="0.80032243"
+       sodipodi:r2="52"
+       sodipodi:r1="94"
+       sodipodi:cy="456"
+       sodipodi:cx="229"
+       sodipodi:sides="5"
+       id="path4879"
+       style="fill:url(#linearGradient3096);fill-opacity:1;stroke:#ffffff;stroke-width:15.98369503;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="star" />
+    <path
+       sodipodi:type="star"
+       style="fill:url(#linearGradient3098);fill-opacity:1;stroke:#ffffff;stroke-width:24.86989784;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path4889"
+       sodipodi:sides="5"
+       sodipodi:cx="229"
+       sodipodi:cy="456"
+       sodipodi:r1="94"
+       sodipodi:r2="52"
+       sodipodi:arg1="0.80032243"
+       sodipodi:arg2="1.428641"
+       inkscape:flatsided="false"
+       inkscape:rounded="0.21"
+       inkscape:randomized="0"
+       d="m 294.46869,523.45259 c -9.08043,8.81335 -45.57491,-17.76993 -58.10148,-15.97712 -12.52658,1.79282 -40.09949,37.54547 -51.28749,31.63294 -11.18801,-5.91252 2.81678,-48.83551 -2.75921,-60.19499 -5.57599,-11.35947 -48.09928,-26.53469 -45.93342,-39.00218 2.16586,-12.46749 47.31577,-12.41208 56.39619,-21.22544 9.08043,-8.81335 10.3725,-53.9448 22.89908,-55.73762 12.52657,-1.79281 26.42597,41.16443 37.61397,47.07695 11.188,5.91252 54.50984,-6.80503 60.08583,4.55445 5.57599,11.35947 -30.98363,37.85309 -33.14948,50.32059 -2.16586,12.46749 23.31643,49.73906 14.23601,58.55242 z"
+       transform="matrix(0.03131375,-0.02522366,0.02522366,0.03131375,2.32085,1020.069)" />
+    <path
+       style="fill:url(#linearGradient3103);fill-opacity:1;stroke:none;display:inline"
+       d="M 9.625 1.5 C 7.0662299 1.5 5 3.5662 5 6.125 L 5 11.09375 C 13.080118 11.574249 23.411903 16.044761 28 19.625 L 28 6.125 C 28 3.5662 25.933769 1.5 23.375 1.5 L 9.625 1.5 z "
+       transform="translate(0,1019.3622)"
+       id="path4881" />
   </g>
 </svg>
diff --git a/sources b/sources
index 014dbba..7be6088 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7e75a9c44897ba608c0dda2c0e1a096f  anki-2.0.31.tgz
+2186925ffa068017a30734e75b8a8ad7  anki-2.0.32.tgz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/anki.git/commit/?h=f22&id=89c3057e12560d867089675e2695d0fe32948904


More information about the scm-commits mailing list