Merge pull request #2538 from alihanozturk/master

clementine:edit

multimedia/sound/clementine/actions.py

@@ -10,6 +10,13 @@ from pisi.actionsapi import pisitools
 from pisi.actionsapi import get
 
 def setup():
+    shelltools.system("sed -i 's|lastfm5/ws.h|lastfm/ws.h|g' CMakeLists.txt")
+    shelltools.system("sed -i 's|lastfm5/Track.h|lastfm/Track.h|g' CMakeLists.txt")
+    shelltools.system("sed -i 's|<lastfm5/|<lastfm/|g' src/internet/lastfm/lastfmcompat.h")
+    shelltools.system("sed -i 's|<lastfm5/|<lastfm/|g' src/internet/lastfm/lastfmservice.cpp")
+    shelltools.system("sed -i 's|<lastfm5/|<lastfm/|g' src/internet/lastfm/lastfmsettingspage.cpp")
+    shelltools.system("sed -i 's|<lastfm5/Track.h>|<lastfm/Track.h>|g' src/core/song.cpp")
+    shelltools.system("sed -i 's|Exec=clementine %U|Exec=clementine|g' dist/clementine.desktop")
     cmaketools.configure(" \
                           -DCMAKE_INSTALL_PREFIX=/usr \
                           -DCMAKE_BUILD_TYPE=Release \

multimedia/sound/clementine/pspec.xml

@@ -32,6 +32,7 @@
             <Dependency>glew-devel</Dependency>
             <Dependency>icon-theme-hicolor</Dependency>
             <Dependency>boost-devel</Dependency>
+            <Dependency>pulseaudio-libs-devel</Dependency>
             <Dependency>libmygpo-qt-devel</Dependency>
             <Dependency>fftw3-devel</Dependency>
             <Dependency>libmtp-devel</Dependency>
@@ -78,9 +79,11 @@
             <Dependency>libgpod</Dependency>
             <Dependency>protobuf</Dependency>
             <Dependency>qt5-base</Dependency>
+            <Dependency>liblastfm</Dependency>
             <Dependency>libmygpo-qt</Dependency>
             <Dependency>gstreamer-next</Dependency>
             <Dependency>libchromaprint</Dependency>
+            <Dependency>pulseaudio-libs</Dependency>
             <Dependency>gst-plugins-base-next</Dependency>
         </RuntimeDependencies>
         <Files>
@@ -91,7 +94,7 @@
 
     <History>
         <Update release="1">
-            <Date>2017-01-06</Date>
+            <Date>2017-01-07</Date>
             <Version>1.3.1</Version>
             <Comment>First release</Comment>
             <Name>Alihan Öztürk</Name>

office/calligra/calligra/pspec.xml

@@ -14,7 +14,7 @@
         <IsA>app:gui</IsA>
         <Summary>An integrated office suite for KDE</Summary>
         <Description>Calligra is a free, integrated office suite for KDE. The application suite consists of a word-processor, a spreadsheet application, a presentation creator and viewer application, an organizer and more.</Description>
-        <Archive sha1sum="8229264ebead597ac562ad009b652c67057ec1f1" type="targz">http://download.kde.org/stable/calligra-3.0.0/calligra-3.0.0.tar.gz</Archive>
+        <Archive sha1sum="f66e1a14042bac3df1fd11ac58bc3cf3f5d38ddb" type="tarxz">http://download.kde.org/stable/calligra-latest/calligra-3.0.0.1.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>qt5-declarative-devel</Dependency>
@@ -266,16 +266,6 @@
             <Path fileType="data">/usr/share/mime/packages/x-iwork-keynote-sffkey.xml</Path>
         </Files>
     </Package>
-
-    <Package>
-        <Name>calligra-handbook</Name>
-        <IsA>app:gui</IsA>
-        <Summary>Documentation for Calligra</Summary>
-        <Files>
-            <Path fileType="doc">/usr/share/doc/HTML/en/calligra/index.cache.bz2</Path>
-            <Path fileType="doc">/usr/share/doc/HTML/en/calligra/index.docbook</Path>
-        </Files>
-    </Package>
     
     <Package>
         <Name>calligra-libs</Name>
@@ -497,10 +487,6 @@
             <Dependency>kconfigwidgets</Dependency>
             <Dependency>kwidgetsaddons</Dependency>
             <Dependency>qt5-declarative</Dependency>
-            <Dependency version="current">calligra-libs</Dependency>
-            <Dependency version="current">calligra-stage</Dependency>
-            <Dependency version="current">calligra-words</Dependency>
-            <Dependency version="current">calligra-sheets</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="data">/</Path>
@@ -662,6 +648,7 @@
             <Path fileType="data">/usr/share/calligra_shape_music/fonts/Emmentaler-14.ttf</Path>
             <Path fileType="data">/usr/share/color</Path>
             <Path fileType="data">/usr/share/mime/packages/calligra_svm.xml</Path>
+            <Path fileType="localedata">/usr/share/locale</Path>
         </Files>
     </Package>
 
@@ -842,6 +829,13 @@
     </Package>
     
     <History>
+        <Update release="2">
+            <Date>2017-01-07</Date>
+            <Version>3.0.0.1</Version>
+            <Comment>Version bump</Comment>
+            <Name>Alihan Öztürk</Name>
+            <Email>alihan@pisilinux.org</Email>
+        </Update>
         <Update release="1">
             <Date>2017-01-06</Date>
             <Version>3.0.0</Version>

office/calligra/calligra/translations.xml

@@ -29,12 +29,6 @@
         <Summary xml:lang="en">Filters for the Calligra office suite</Summary>
         <Summary xml:lang="tr">Calligra ofis programı için filtreler.</Summary>
     </Package>
-
-    <Package>
-        <Name>calligra-handbook</Name>
-        <Summary xml:lang="en">Documentation for Calligra</Summary>
-        <Summary xml:lang="tr">Calligra için belgeler.</Summary>
-    </Package>
     
     <Package>
         <Name>calligra-libs</Name>