[unixODBC-gui-qt] minor specfile improvements
Tom Lane
tgl at fedoraproject.org
Tue Jan 10 19:49:56 UTC 2012
commit e5320cb7580bb069348356217e5ba0c0307136e1
Author: Tom Lane <tgl at redhat.com>
Date: Tue Jan 10 14:49:42 2012 -0500
minor specfile improvements
unixODBC-gui-qt.spec | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
---
diff --git a/unixODBC-gui-qt.spec b/unixODBC-gui-qt.spec
index 85fc7a3..ee05a37 100644
--- a/unixODBC-gui-qt.spec
+++ b/unixODBC-gui-qt.spec
@@ -1,17 +1,19 @@
+# currently we have to pull directly from upstream SVN
%global svn 98
%global checkout 20120105svn%{svn}
Summary: Several GUI (Qt) programs and plug-ins for unixODBC
Name: unixODBC-gui-qt
-# There has not been a formal upstream release yet and we're not
-# sure about the first formal release version, so using 0
+# There has not been a formal upstream release yet and we're not
+# sure what the first formal release version number will be, so using 0
Version: 0
-Release: 0.3.%{checkout}%{?dist}
+Release: 0.4.%{checkout}%{?dist}
Group: Applications/Databases
URL: http://sourceforge.net/projects/unixodbc-gui-qt/
# Programs are GPL, libraries are LGPL
License: GPLv3 and LGPLv3
-# Source code is available only in SVN by upstream, so using own
+
+# Source code is available only in SVN by upstream, so using own
# tarball created from the last commit. SVN repository can be found at
# https://unixodbc-gui-qt.svn.sourceforge.net/svnroot/unixodbc-gui-qt
Source: %{name}-%{checkout}.tar.bz2
@@ -23,13 +25,13 @@ Patch1: unixODBC-gui-qt-qstring.patch
# We'd like to have the same soname version as former unixODBC-kde had
Patch2: unixODBC-gui-qt-so-version-bump.patch
-Requires: unixODBC
-BuildRequires: qt4-devel qt-assistant-adp-devel
+BuildRequires: qt4-devel qt-assistant-adp-devel
BuildRequires: libtool libtool-ltdl-devel
BuildRequires: unixODBC-devel
BuildRequires: desktop-file-utils
-# Since unixODBC-2.3.0 does not contain GUI tools anymore, we can say
-# unixODBC-gui-qt obsoletes all versions of unixODBC-kde bellow 2.3.0
+
+# Since unixODBC-2.3.0 does not contain GUI tools anymore, we can say
+# unixODBC-gui-qt obsoletes all versions of unixODBC-kde before 2.3.0
Provides: unixODBC-kde = 2.3.0-1
Obsoletes: unixODBC-kde < 2.3.0-1
@@ -74,7 +76,7 @@ make DESTDIR=$RPM_BUILD_ROOT install
desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE3}
-
+
# install icons used for applications in *.desktop files
install -p -m 644 ODBCDataManagerQ4/ODBC64.xpm \
$RPM_BUILD_ROOT%{_datadir}/pixmaps/ODBCCreateDataSourceQ4.xpm
@@ -100,11 +102,14 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%postun -p /sbin/ldconfig
%changelog
+* Tue Jan 10 2012 Tom Lane <tgl at redhat.com> - 0-0.4.20120105svn98
+- minor specfile improvements
+
* Thu Jan 05 2012 Honza Horak <hhorak at redhat.com> - 0-0.3.20120105svn98
- fixed issues found by Package Review process (see #767622)
* Thu Dec 15 2011 Honza Horak <hhorak at redhat.com> - 0-0.2.20111208svn95
-- add Provides: unixODBC-kde to indicate unixODBC-gui-qt fills the gap after
+- add Provides: unixODBC-kde to indicate unixODBC-gui-qt fills the gap after
GUI utils are no longer part of unixODBC
* Tue Dec 13 2011 Honza Horak <hhorak at redhat.com> - 0-0.1.20111208svn95
More information about the scm-commits
mailing list