[simdock] Latest from upstream

[terjeros]

commit de5124b40dd2ed89be199b96d6bba9c87698387c
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Wed Jan 30 20:29:52 2013 +0100

    Latest from upstream
    
    - New upstream location

 .gitignore                      |    1 +
 README.fedora                   |   23 -----------------------
 simdock-1.2-build-envvars.patch |   16 ----------------
 simdock-1.2-readme.patch        |   20 --------------------
 simdock-1.2-tasks.patch         |   11 -----------
 simdock.spec                    |   31 +++++++++++++++----------------
 sources                         |    2 +-
 7 files changed, 17 insertions(+), 87 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 58d49b0..6c399a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 simdock_1.2.tar.gz
+/simdock-1.2.6-b38a159.tar.gz
diff --git a/simdock.spec b/simdock.spec
index 7524d0f..646706c 100644
--- a/simdock.spec
+++ b/simdock.spec
@@ -1,18 +1,17 @@
-Name:          simdock
+%global commit b38a159f4fb44a972958d905d93a8be1b50379e8
+%global scommit %(c=%{commit}; echo ${c:0:7})
+
 Summary:       Fast and customizable dockbar
-Version:       1.2
-Release:       15%{?dist}
+Name:          simdock
+Version:       1.2.6
+Release:       1.20130128git%{?dist}
 License:       GPLv2+
 Group:         User Interface/Desktops
-URL:           http://simdock.sourceforge.net/
-Source0:       http://downloads.sourceforge.net/simdock/%{name}_%{version}.tar.gz
-Source1:       README.fedora
+URL:           https://github.com/onli/simdock
+Source0:       https://github.com/onli/simdock/archive/%{commit}/%{name}-%{version}-%{scommit}.tar.gz
 Patch0:        simdock-1.2.desktop.patch
 Patch1:        simdock-1.2-pixmap.patch
-Patch2:        simdock-1.2-readme.patch
-Patch3:        simdock-1.2-tasks.patch
-Patch4:        simdock-1.2-build-envvars.patch
-Patch5:        simdock-1.2-dso.patch
+Patch2:        simdock-1.2-dso.patch
 Buildrequires: desktop-file-utils
 BuildRequires: GConf2-devel
 BuildRequires: libwnck-devel
@@ -28,14 +27,10 @@ wxWidgets and fits well in Gnome but works on most desktop
 environments. Does not require Compiz nor 3D acceleration.
 
 %prep
-%setup -q -n trunk
+%setup -q -n %{name}-%{commit}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%{__install} -m 0644 %{SOURCE1} .
 %{__ln_s} configure.ac configure.in
 
 %build
@@ -54,13 +49,17 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications \
 
 %files
 %defattr(-, root, root, -)
-%doc AUTHORS COPYING LICENSE README README.fedora
+%doc AUTHORS COPYING LICENSE README
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Mon Jan 28 2013 Terje Rosten <terje.rosten at ntun.no> - 1.2.6-1.20130128git
+- Latest from upstream
+- New upstream location
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index a164b27..865b5f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-557f4aff394fa66e329c56c3a5138b39  simdock_1.2.tar.gz
+9bf2bb863f297e7c83d35729841b7448  simdock-1.2.6-b38a159.tar.gz