summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Gansser <mgansser@alice.de>2016-07-01 19:57:55 +0200
committerMartin Gansser <mgansser@alice.de>2016-07-01 19:57:55 +0200
commitc398be76fb1edd2b346ecfc6b27ab23b588d73ab (patch)
treea5064652bbbbc8a59a9f675e6132a478f9cf807c
parentccfb36ba288b22e93485b0ef8639df5a283c56f1 (diff)
downloadaqualung-c398be76fb1edd2b346ecfc6b27ab23b588d73ab.zip
aqualung-c398be76fb1edd2b346ecfc6b27ab23b588d73ab.tar.gz
aqualung-c398be76fb1edd2b346ecfc6b27ab23b588d73ab.tar.xz
Switched from svn to git
- Update to 1.0-0.2.rc1git05dfcb7 - Added %{_docdir}/%{name}
-rw-r--r--.gitignore1
-rwxr-xr-xaqualung-snapshot.sh31
-rw-r--r--aqualung.spec35
-rw-r--r--sources2
4 files changed, 23 insertions, 46 deletions
diff --git a/.gitignore b/.gitignore
index f5e5541..a043d00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
aqualung-export-r1309.tar.bz2
+/aqualung-05dfcb7.tar.gz
diff --git a/aqualung-snapshot.sh b/aqualung-snapshot.sh
deleted file mode 100755
index 166c05c..0000000
--- a/aqualung-snapshot.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-set -e
-
-tmp=$(mktemp -d)
-
-trap cleanup EXIT
-cleanup() {
- set +e
- [ -z "${tmp}" -o ! -d "${tmp}" ] || rm -rf "${tmp}"
-}
-
-unset CDPATH
-pwd="$(pwd)"
-tmp_dirname=aqualung-export
-
-cd "${tmp}"
-svn co \
- https://aqualung.svn.sourceforge.net/svnroot/aqualung/trunk "${tmp_dirname}"
-cd "${tmp_dirname}"
-
-svn=$(LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2)
-echo "#define AQUALUNG_VERSION \"R-${svn}\"" > src/version.h
-find . -type d -name .svn -print0 | xargs -0r rm -rf
-cd ..
-dirname="${tmp_dirname}-r${svn}"
-mv "$tmp_dirname" "$dirname"
-
-tar fjc "$pwd"/"${dirname}".tar.bz2 "${dirname}"
-cd "${dirname}" >/dev/null
-
diff --git a/aqualung.spec b/aqualung.spec
index 563f8c7..6bbd8a2 100644
--- a/aqualung.spec
+++ b/aqualung.spec
@@ -1,4 +1,6 @@
-%global svn_rev 1309
+#https://github.com/jeremyevans/aqualung/commit/05dfcb75ddb1b9f413b80b3d42a7ca96a8ef3906
+%global commit0 05dfcb75ddb1b9f413b80b3d42a7ca96a8ef3906
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global nonfree 0
%global free 1
@@ -15,17 +17,13 @@
%endif
Name: aqualung
-Version: 0.9
-Release: 0.8.svn%{svn_rev}%{?dist}
+Version: 1.0
+Release: 0.2.rc1git%{shortcommit0}%{?dist}
Summary: Music Player for GNU/Linux
-
-Group: Applications/Multimedia
License: GPLv2+
-URL: http://aqualung.factorial.hu/
-# run ./aqualung-snapshot.sh to get this
-Source0: %{name}-export-r%{svn_rev}.tar.bz2
+URL: http://aqualung.jeremyevans.net/
+Source0: https://github.com/jeremyevans/aqualung/archive/%{commit0}/%{name}-%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz
Source1: %{name}.desktop
-Source10: %{name}-snapshot.sh
# autogen.sh
BuildRequires: autoconf automake pkgconfig gettext-devel
@@ -70,7 +68,7 @@ well as sound files in just about any audio format and has the feature of
inserting no gaps between adjacent tracks.
%prep
-%setup -q -n %{name}-export-r%{svn_rev}
+%setup -qn %{name}-%{commit0}
%build
./autogen.sh
@@ -132,8 +130,17 @@ update-desktop-database &> /dev/null || :
%{_datadir}/man/man1/%{name}.*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
+%{_docdir}/%{name}
%changelog
+* Fri Jul 01 2016 Martin Gansser <martinkg@fedoraproject.org> - 1.0-0.2.rc1git05dfcb7
+- Switched from svn to git
+- Update to 1.0-0.2.rc1git05dfcb7
+- Added %%{_docdir}/%%{name}
+
+* Fri Aug 28 2015 Martin Gansser <martinkg@fedoraproject.org> - 1.0-0.1.svn1311
+- Update to SVN r1311
+
* Mon Mar 02 2015 Martin Gansser <martinkg@fedoraproject.org> - 0.9-0.8.svn1309
- dropped aqualung-fsf-fix.patch
@@ -154,16 +161,16 @@ update-desktop-database &> /dev/null || :
- corrected license tag
* Tue Feb 2 2010 Akio Idehara <zbe64533 at gmail.com> 0.9-0.5.svn1115
-- Disable mac support. This is mac's the license issue.
+- Disable mac support, this is mac's the license issue
* Mon Feb 1 2010 Akio Idehara <zbe64533 at gmail.com> 0.9-0.4.svn1115
-- Add post/postun.
+- Add post/postun
* Mon Feb 1 2010 Akio Idehara <zbe64533 at gmail.com> 0.9-0.3.svn1115
-- Update to SVN r1115.
+- Update to SVN r1115
* Sun Jan 31 2010 Akio Idehara <zbe64533 at gmail.com> 0.9-0.2.svn1109
-- Change Socket test routine.
+- Change Socket test routine
* Sat Jan 23 2010 Akio Idehara <zbe64533 at gmail.com> 0.9-0.1.svn1109
- Initial RPM release
diff --git a/sources b/sources
index 3923d4e..8d4207d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a83ceedf7adaefa0a4a10f861119457 aqualung-export-r1309.tar.bz2
+b80f5be22f9823c48f066448ab29c242 aqualung-05dfcb7.tar.gz