diff --git a/ChangeLog.txt b/ChangeLog.txt index 95865964b9..d17949ac3e 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,15 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2015-02-11 13:10 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * package/harbour-wce.spec.in + * package/harbour-win.spec.in + * package/harbour.spec + * changed deprecated BuildPrereq tag to BuildRequires + ! remove optionally created libtiff + + ; above modifications close issue #38 + 2015-02-11 12:31 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/codepage/l_fr.h + added 'Ç' and 'ç' characters to set of french letters diff --git a/package/harbour-wce.spec.in b/package/harbour-wce.spec.in index 817fd2b51b..c93a6db140 100644 --- a/package/harbour-wce.spec.in +++ b/package/harbour-wce.spec.in @@ -32,7 +32,7 @@ License: GPL (plus exception) Group: Development/Languages URL: http://harbour-project.org/ Source: harbour-%{version}.src.tar.gz -BuildPrereq: gcc binutils +BuildRequires: gcc binutils Requires: gcc binutils sh-utils cegcc-mingw32ce harbour = %{?epoch:%{epoch}:}%{version}-%{release} Provides: %{name} BuildRoot: /tmp/%{name}-%{version}-root diff --git a/package/harbour-win.spec.in b/package/harbour-win.spec.in index 43750ccd83..9b4ba7e36e 100644 --- a/package/harbour-win.spec.in +++ b/package/harbour-win.spec.in @@ -32,7 +32,7 @@ License: GPL (plus exception) Group: Development/Languages URL: http://harbour-project.org/ Source: harbour-%{version}.src.tar.gz -BuildPrereq: gcc binutils +BuildRequires: gcc binutils Requires: gcc binutils sh-utils harbour = %{?epoch:%{epoch}:}%{version}-%{release} Provides: %{name} BuildRoot: /tmp/%{name}-%{version}-root diff --git a/package/harbour.spec b/package/harbour.spec index d1a3e20ec1..2fde5deb26 100644 --- a/package/harbour.spec +++ b/package/harbour.spec @@ -100,7 +100,7 @@ License: GPL (plus exception) Group: Development/Languages URL: http://harbour-project.org/ Source: %{name}-%{version}.src.tar.gz -BuildPrereq: gcc binutils %{!?_without_curses: ncurses-devel} %{!?_without_gpm: gpm-devel} +BuildRequires: gcc binutils %{!?_without_curses: ncurses-devel} %{!?_without_gpm: gpm-devel} Requires: gcc binutils sh-utils %{name}-lib = %{?epoch:%{epoch}:}%{version}-%{release} Provides: %{name} harbour lib%{name}.so BuildRoot: /tmp/%{name}-%{version}-root @@ -412,10 +412,11 @@ make install %{?_smp_mflags} rm -fR %{!?hb_ldconf:$HB_INSTALL_ETC/ld.so.conf.d} rm -f %{?hb_ldconf:$RPM_BUILD_ROOT/%{_libdir}/*.so*} rm -f $RPM_BUILD_ROOT/%{_bindir}/{3rdpatch.hb,check.hb,commit.hb,harbour.ucf} -rm -f $HB_INSTALL_LIB/libbz2.a \ - $HB_INSTALL_LIB/libjpeg.a \ - $HB_INSTALL_LIB/liblibhpdf.a \ +rm -f $HB_INSTALL_LIB/libjpeg.a \ $HB_INSTALL_LIB/libpng.a \ + $HB_INSTALL_LIB/libtiff.a \ + $HB_INSTALL_LIB/libbz2.a \ + $HB_INSTALL_LIB/liblibhpdf.a \ $HB_INSTALL_LIB/libsqlite3.a \ $HB_INSTALL_LIB/libexpat.a \ $HB_INSTALL_LIB/liblzf.a \