From d46f321bf989d986aa90ea345b266c7f9c665dc3 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Nov 07 2012 15:14:18 +0000 Subject: update to the latest stable git source --- diff --git a/.gitignore b/.gitignore index f1f502d..d1af369 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ freetds-0.82.tar.gz /freetds-patched.tgz /freetds-0.91.tar.bz2 +/freetds-0.91-f3ae29d.tar.gz diff --git a/freetds.spec b/freetds.spec index bfb5ce3..0ca0522 100644 --- a/freetds.spec +++ b/freetds.spec @@ -1,3 +1,5 @@ +%define git_commit f3ae29d + %ifarch alpha ia64 x86_64 ppc64 sparc64 s390x %define bits 64 %else @@ -7,15 +9,23 @@ Name: freetds Summary: Implementation of the TDS (Tabular DataStream) protocol Version: 0.91 -Release: 4%{?dist} +Release: 5.git%{git_commit}%{?dist} Group: System Environment/Libraries License: LGPLv2+ and GPLv2+ URL: http://www.freetds.org/ -Source0: ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-%{version}.tar.bz2 + +# download the latest git source for 0.91 branch from +# http://gitorious.org/freetds/freetds/archive-tarball/Branch-0_91 +# then +# mv freetds-freetds-Branch-0_91.tar.gz freetds-%{version}-%{git_commit}.tar.gz +Source0: freetds-%{version}-%{git_commit}.tar.gz + +#Source0: ftp://ftp.freetds.org/pub/freetds/stable/freetds-%{version}.tar.bz2 Source1: freetds-tds_sysdep_public.h BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: unixODBC-devel, readline-devel, gnutls-devel, krb5-devel +BuildRequires: doxygen, docbook-style-dsssl %description @@ -39,6 +49,7 @@ to install %{name}-devel. %package doc Summary: Development documentation for %{name} Group: Documentation +BuildArch: noarch %description doc This package contains the development documentation for %{name}. @@ -47,20 +58,24 @@ If you like to develop programs using %{name}, you will need to install %prep -%setup -q +%setup -q -n freetds-freetds +#%setup -q # correct perl path sed -i '1 s,#!.*/perl,#!%{__perl},' samples/*.pl -chmod -x samples/*.sh +chmod -x samples/*.sh samples/*.pl -rm -rf doc/images/CVS doc/images/callouts/CVS +find . -name .cvsignore -print | xargs rm -f +find . -name .gitignore -print | xargs rm -f %build export LIBS=-lgcrypt +[ -f configure ] || NOCONFIGURE=yes ./autogen.sh + %configure \ --disable-dependency-tracking \ --disable-rpath \ @@ -72,7 +87,7 @@ export LIBS=-lgcrypt --with-gnutls \ --enable-krb5 -make %{?_smp_mflags} +make %{?_smp_mflags} DOCBOOK_DSL="`rpm -ql docbook-style-dsssl | fgrep html/docbook.dsl`" %install @@ -127,6 +142,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Nov 7 2012 Dmitry Butskoy - 0.91-5.gitf3ae29d +- update to the latest git source for 0_91 branch +- fix #870483 + * Thu Jul 19 2012 Fedora Release Engineering - 0.91-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 94ffb12..555d141 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e88e96800c89d62307812315b235eb18 freetds-0.91.tar.bz2 +cb7ddf2280ef364d2e47b02a1e4726d9 freetds-0.91-f3ae29d.tar.gz