Fix git branch and commit revision in version.

dist/maketarball.sh.in

@@ -1,8 +1,7 @@
 #!/bin/bash
 
 name=strawberry
-version="@STRAWBERRY_VERSION_SPARKLE@"
-deb_dist="@DEB_DIST@"
+version="@STRAWBERRY_VERSION_PACKAGE@"
 root=$(cd "${0%/*}/.." && echo $PWD/${0##*/})
 root=`dirname "$root"`
 rootnoslash=`echo $root | sed "s/^\///"`
@@ -15,8 +14,6 @@ tar -cJf $name-$version.tar.xz \
     --exclude "$root/dist/*.tar" \
     --exclude "$root/dist/*.tar.*" \
     --exclude "$root/CMakeLists.txt.user" \
+    --exclude "$root/build" \
     --exclude ".directory" \
     "$root"
-
-echo "Also creating ${name}_${version}~${deb_dist}.orig.tar.xz..."
-cp "$name-$version.tar.xz" "${name}_${version}~${deb_dist}.orig.tar.xz"

dist/strawberry.spec.in

@@ -4,9 +4,9 @@ Release:        @STRAWBERRY_VERSION_RPM_R@.@RPM_DISTRO@
 Summary:        A audio player and music collection organiser
 
 Group:          Applications/Multimedia
-License:        GPLv3
+License:        GPL-3.0+
 URL:            http://www.strawbs.org/
-Source0:        %{name}-@STRAWBERRY_VERSION_SPARKLE@.tar.xz
+Source0:        %{name}-@STRAWBERRY_VERSION_PACKAGE@.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  make
@@ -49,14 +49,6 @@ Requires:       glib-2.0
 Requires:       gio-2.0
 Requires:       protobuf
 Requires:       cryptopp
-Requires:       libsqlite3-0
-Requires:       taglib
-Requires:       libcdio
-Requires:       libgpod-1.0
-Requires:       libchromaprint
-Requires:       libmtp
-Requires:       libpulse
-Requires:       libxml
 Requires:       Qt5Core
 Requires:       Qt5Gui
 Requires:       Qt5Widgets
@@ -91,18 +83,17 @@ Requires:       gstreamer1.0(decoder-audio/x-wav)
 Strawberry is a modern audio player and music collection organiser.
 It is a fork of Clementine. The name is inspired by the band Strawbs.
 
-Features include:
-
-  * Organize and play your music collection
-  * Edit tags on your music
-  * Download album cover art from Last.fm, musicbrainz, Discogs and Amazon
+Features:
+  * Play and organize music
+  * Edit tags on music files
+  * Album cover art from Lastfm, Musicbrainz, Discogs and Amazon
   * Native desktop notifications
-  * Import and export playlists in multiple formats
-  * Copy music to your iPod, iPhone, MTP or mass-storage USB player
+  * Playlists in multiple formats
+  * Transfer music to iPod, iPhone, MTP or mass-storage USB player
   * Support for multiple backends
 
 %prep
-%setup -q -n %{name}-@STRAWBERRY_VERSION_SPARKLE@
+%setup -q -n %{name}-@STRAWBERRY_VERSION_PACKAGE@
 
 %build
 %{cmake} .. -DUSE_INSTALL_PREFIX=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON
@@ -116,7 +107,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 cd build
 make clean
 
-
 %files
 %defattr(-,root,root,-)
 %doc
@@ -127,5 +117,6 @@ make clean
 %{_datadir}/icons/hicolor/64x64/apps/strawberry.png
 %{_datadir}/icons/hicolor/128x128/apps/strawberry.png
 %{_datadir}/icons/hicolor/scalable/apps/strawberry.svg
+%{_mandir}/man1/%{name}.1%{?ext_man}
 
 %changelog