[mdbtools] Update to 0.7.1, Update site/source to github urls, Cleanup spec

Peter Robinson pbrobinson at fedoraproject.org
Sun May 18 19:26:37 UTC 2014


commit 949231fe2789b9c405592b68c70ccee978a5dfbd
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun May 18 20:26:27 2014 +0100

    Update to 0.7.1, Update site/source to github urls, Cleanup spec

 .gitignore                                    |    5 +-
 mdbtools-0.5.99.0.6pre1.0.20051109-odbc.patch |   73 -------------------
 mdbtools-0.6-crashes.patch                    |   94 -------------------------
 mdbtools.spec                                 |   85 ++++++++--------------
 sources                                       |    4 +-
 5 files changed, 34 insertions(+), 227 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 93230e2..8bb4ccf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-mdbtools-0.6pre1-cvs20051109.patch.gz
-mdbtools-0.6pre1.tar.gz
-mdbtools_0.5.99.0.6pre1.0.20051109-4.diff.gz
+mdbtools-0.*.tar.gz
+0.*.tar.gz
diff --git a/mdbtools.spec b/mdbtools.spec
index 4a16699..be4a02c 100644
--- a/mdbtools.spec
+++ b/mdbtools.spec
@@ -1,21 +1,20 @@
 %define prever pre1
 
 Name:           mdbtools
-Version:        0.6
-Release:        0.14.cvs20051109%{?dist}
+Version:        0.7.1
+Release:        1%{?dist}
 Summary:        Access data stored in Microsoft Access databases
 Group:          Applications/Databases
 License:        GPLv2+
-URL:            http://mdbtools.sourceforge.net/
-Source0         http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{prever}.tar.gz
+URL:            https://github.com/brianb/mdbtools/wiki
+
+Source0         https://github.com/brianb/mdbtools/archive/%{version}.tar.gz
 Source1:        gmdb2.desktop
-Patch0:         mdbtools-0.6pre1-cvs20051109.patch.gz
-Patch1:         ftp://ftp.nluug.nl/pub/os/Linux/distr/debian/pool/main/m/mdbtools/mdbtools_0.5.99.0.6pre1.0.20051109-4.diff.gz
-Patch2:         mdbtools-0.6-crashes.patch
-Patch3:         mdbtools-0.5.99.0.6pre1.0.20051109-odbc.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  unixODBC-devel libgnomeui-devel readline-devel
+BuildRequires:  libxml2-devel libgnomeui-devel 
+BuildRequires:  unixODBC-devel readline-devel
 BuildRequires:  bison flex desktop-file-utils
+BuildRequires:  txt2man gnome-common rarian-compat
+BuildRequires:  libtool autoconf automake
 Requires:       %{name}-libs = %{version}-%{release}
 
 %description
@@ -56,53 +55,29 @@ for MDB Tools
 
 
 %prep
-%setup -q -n %{name}-%{version}%{prever}
-%patch0 -p1
-%patch1 -p1
-pushd debian/patches
-for i in *; do
-  echo $i
-  case "$i" in
-    015-allsyms.patch|038-removals.patch|045-aboutdialog.patch|056-libmdb-data.patch)
-      patch -d ../.. -p0 < $i
-      ;;
-    *)
-      patch -d ../.. -p1 < $i
-  esac
-done
-popd
-%patch2 -p1 -z .crash
-%patch3 -p1 -z .odbc
-chmod -x COPYING.LIB
+%setup -q
 
+autoreconf -vif
 
 %build
-%configure --disable-static --enable-sql --with-unixodbc="%{_prefix}"
-# Don't use rpath!
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make %{?_smp_mflags}
+%configure --disable-static --enable-sql --with-unixodbc="%{_prefix}" --enable-gtk-doc
+
+LANG=C make %{?_smp_mflags} V=1
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR="$RPM_BUILD_ROOT"
-rm $RPM_BUILD_ROOT%{_libdir}/libmdb*.la
-# remove some headers which should not be installed / exported
-rm $RPM_BUILD_ROOT%{_includedir}/{connectparams.h,gmdb.h,mdbodbc.h}
-rm $RPM_BUILD_ROOT%{_includedir}/{mdbprivate.h,mdbver.h}
+LANG=C make install DESTDIR="$RPM_BUILD_ROOT"
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install \
-%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
-  --vendor fedora \
-%endif
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
+#Remove libtool archives.
+find %{buildroot} -type f -name "*.la" -delete
 
+# remove some headers which should not be installed / exported
+rm $RPM_BUILD_ROOT%{_includedir}/gmdb.h
+rm $RPM_BUILD_ROOT%{_includedir}/mdbver.h
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 
+desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
 
 %post libs -p /sbin/ldconfig
 
@@ -110,32 +85,34 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/mdb-*
 %{_mandir}/man1/mdb-*.1.gz
 
 %files libs
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING.LIB NEWS README TODO doc/faq.html
+%doc AUTHORS COPYING.LIB NEWS README
 %{_libdir}/libmdb*.so.*
 
 %files devel
-%defattr(-,root,root,-)
-%doc HACKING
+%doc HACKING ChangeLog TODO doc/faq.html
 %{_libdir}/libmdb*.so
 %{_libdir}/pkgconfig/libmdb*.pc
 %{_includedir}/mdb*.h
 
 %files gui
-%defattr(-,root,root,-)
 %{_bindir}/gmdb2
 %{_datadir}/gmdb
 %{_datadir}/gnome/help/gmdb
 %{_datadir}/applications/*gmdb2.desktop
-
+%{_datadir}/omf/mdbtools/gmdb-C.omf
+%{_mandir}/man1/gmdb2.1.gz
 
 %changelog
+* Sun May 18 2014 Peter Robinson <pbrobinson at fedoraproject.org> 0.7.1-1
+- Update to 0.7.1
+- Update site/source to github urls
+- Cleanup spec
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-0.14.cvs20051109
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 7f7a938..e6186b0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-8e603377e9a50c62957243db935c70d6  mdbtools-0.6pre1-cvs20051109.patch.gz
-246e8f38b2a1af1bcff60ee0da59300b  mdbtools-0.6pre1.tar.gz
-bcbcf53bfab1a00d428f534e87bce4b6  mdbtools_0.5.99.0.6pre1.0.20051109-4.diff.gz
+477c7af98e75f8e6c987b020d6a822d8  0.7.1.tar.gz


More information about the scm-commits mailing list