fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2015-02-11 13:10 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* 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
This commit is contained in:
Przemysław Czerpak
2015-02-11 13:10:47 +01:00
parent 080ab48930
commit bc40e114db
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/harbour-wce.spec.in
View File

@@ -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

2
package/harbour-win.spec.in
View File

@@ -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

9
package/harbour.spec
View File

@@ -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 \