From 5da69baa9d07bbdf08f1200ace03d4112d830f0f579245cf4d7d27216d2604f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Mon, 10 Oct 2011 15:15:00 +0000 Subject: [PATCH] Accepting request 87248 from home:jengelh:bl-new Resubmit for 87174, %makeinstall OBS-URL: https://build.opensuse.org/request/show/87248 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/freetds?expand=0&rev=10 --- freetds.changes | 7 +++++++ freetds.spec | 15 ++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/freetds.changes b/freetds.changes index e7e141e..b3c5165 100644 --- a/freetds.changes +++ b/freetds.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Oct 9 13:49:44 UTC 2011 - jengelh@medozas.de + +- Add missing "Group" for libfreetds and change %make_install, + resolving build failure for SLE11 +- Remove redundant sections (cf. specfile guidelines) + ------------------------------------------------------------------- Sat Oct 1 05:39:08 UTC 2011 - coolo@suse.com diff --git a/freetds.spec b/freetds.spec index a390ff8..d73a5d5 100644 --- a/freetds.spec +++ b/freetds.spec @@ -24,7 +24,7 @@ Release: 1 %define filever 0.91rc License: LGPL Summary: A free re-implementation of the TDS (Tabular DataStream) protocol -Url: http://www.freetds.org/ +URL: http://www.freetds.org/ Group: Productivity/Databases/Clients Source: %{name}-%{filever}.tar.bz2 BuildRequires: fdupes @@ -45,8 +45,8 @@ communications. FreeTDS includes call level interfaces for DB-Lib, CT-Lib, and ODBC. %package -n libfreetds - Summary: A free re-implementation of the TDS (Tabular DataStream) protocol +Group: System/Libraries Provides: %{name} = %{version} Obsoletes: %{name} < %{version} @@ -71,7 +71,6 @@ and ODBC. This package provides application to allow users to make use of the protocol %package devel - Summary: Include files needed for development with FreeTDS Group: Development/Libraries/C and C++ Requires: %{name} = %{version} @@ -81,7 +80,6 @@ The freetds-devel package contains the files necessary for development with the FreeTDS libraries. %package -n libtdsodbc0 - Summary: FreeTDS ODBC Driver for unixODBC Group: Productivity/Databases/Clients Requires: unixODBC >= 2.0.0 @@ -90,7 +88,6 @@ Requires: unixODBC >= 2.0.0 The freetds-unixodbc package contains ODBC driver build for unixODBC. %package doc - Summary: User documentation for FreeTDS Group: Productivity/Databases/Clients @@ -122,7 +119,7 @@ autoreconf --force --install make %{?_smp_flags} RPM_OPT_FLAGS="%{optflags}" %install -%make_install +%makeinstall mkdir -p %{buildroot}%{_docdir}/freetds/ mv %{buildroot}%{_datadir}/doc/freetds-*/* %{buildroot}%{_docdir}/freetds/ rm -rf %{buildroot}%{_docdir}/freetds-* %{buildroot}/%{_datadir}/doc/freetds-* @@ -143,16 +140,12 @@ Driver = %{_libdir}/libtdsodbc.so.0 Setup = %{_libdir}/libtdsodbc.so.0" | odbcinst -i -d -r > /dev/null 2>&1 || true /sbin/ldconfig 2> /dev/null -%postun -n libtdsodbc0 -/sbin/ldconfig 2> /dev/null +%postun -n libtdsodbc0 -p /sbin/ldconfig %preun -n libtdsodbc0 odbcinst -u -d -n 'FreeTDS' > /dev/null 2>&1 || true odbcinst -u -d -n 'SQL Server' > /dev/null 2>&1 || true -%clean -rm -rf %{buildroot} - %files -n libfreetds %defattr(-,root,root) %doc AUTHORS BUGS COPYING* ChangeLog INSTALL NEWS README TODO