[sqliteman/f14/master] - 1.2.2

[terjeros]

commit 6ec36ede3aad23959cc466a52153c4737b32159b
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Sun Jan 30 19:08:14 2011 +0100

    - 1.2.2

 .gitignore                    |    1 +
 sources                       |    2 +-
 sqliteman-1.0.1.desktop.patch |   18 ------------------
 sqliteman-1.2.1-qt-4.7.patch  |   22 ----------------------
 sqliteman.spec                |   14 +++++++-------
 5 files changed, 9 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8cd9b6b..8633559 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 sqliteman-1.2.1.tar.gz
+/sqliteman-1.2.2.tar.gz
diff --git a/sources b/sources
index 99b6cf3..ab5d190 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-98151419064e23e55504d8f20bb80f3f  sqliteman-1.2.1.tar.gz
+5ecdf710e23606e1b924f740ea69306d  sqliteman-1.2.2.tar.gz
diff --git a/sqliteman.spec b/sqliteman.spec
index aea0ff2..3804a30 100644
--- a/sqliteman.spec
+++ b/sqliteman.spec
@@ -1,14 +1,12 @@
 Summary:       Manager for sqlite - Sqlite Databases Made Easy
 Name:          sqliteman
-Version:       1.2.1
-Release:       4%{?dist}
+Version:       1.2.2
+Release:       1%{?dist}
 # src is GPLv2+, icons are LGPLv2+
 License:       GPLv2+ and LGPLv2+
 Group:         Applications/Databases
 URL:           http://www.sqliteman.com/
 Source :       http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:        sqliteman-1.0.1.desktop.patch
-Patch1:        sqliteman-1.2.1-qt-4.7.patch
 Requires:      qt-sqlite
 BuildRequires: cmake qt4-devel >= 4.2.0
 BuildRequires: desktop-file-utils
@@ -25,8 +23,6 @@ the applications designed for tasks such this (Kexi, knoda).
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %cmake -DWANT_INTERNAL_QSCINTILLA=1
@@ -42,7 +38,8 @@ desktop-file-install   \
     %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 # fix location of desktop icon
-mv %{buildroot}%{_datadir}/icons %{buildroot}%{_datadir}/pixmaps
+%{__install} -p -m 0644 -D %{buildroot}%{_datadir}/icons/hicolor/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
+%{__rm} -rf %{buildroot}%{_datadir}/icons
 
 # no test defined yet
 #check
@@ -70,6 +67,9 @@ fi
 %{_datadir}/%{name}
 
 %changelog
+* Sun Jan 29 2011 Terje Rosten <terje.rosten at ntnu.no> - 1.2.2-1
+- 1.2.2
+
 * Wed Sep  8 2010 Terje Rosten <terje.rosten at ntnu.no> - 1.2.1-4
 - Switch to explicit qt4 buildreq