diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 56f0553dbd..e7b43d1cd2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,20 @@ The license applies to all entries newer than 2009-04-28. */ +2010-07-28 13:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * mpkg_rpm.sh + - Deleted conectiva specific branch which apparently was never run. + + * package/harbour-win.spec + * package/harbour-wce.spec + * package/harbour.spec + - Deleted CC_HB_USER_PRGFLAGS. + - Deleted conectiva and aurox (discontinued) distro detection. + ! Fixed to delete libbz2.a (I hope it's right) + - Deleted logic installing man and .def files. Now it's done by + postinst.hbs. + ! Fixed HB_MAN_INSTALL definition not being included before build. + 2010-07-28 13:41 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * mpkg_rpm.sh ! Fixed very old typo in two cp commands which now got activated. diff --git a/harbour/mpkg_rpm.sh b/harbour/mpkg_rpm.sh index de304b86e7..e5d1f8c206 100755 --- a/harbour/mpkg_rpm.sh +++ b/harbour/mpkg_rpm.sh @@ -49,14 +49,8 @@ do INST_PARAM="${INST_PARAM} $1" if [ "${LAST}" = "--with" ] then - if [ -f /etc/conectiva-release ] - then - [ "$1" = "mysql" ] && NEED_RPM="${NEED_RPM} MySQL-devel" - [ "$1" = "odbc" ] && NEED_RPM="${NEED_RPM} unixodbc-devel" - else - [ "$1" = "mysql" ] && NEED_RPM="${NEED_RPM} mysql-devel" - [ "$1" = "odbc" ] && NEED_RPM="${NEED_RPM} unixODBC-devel" - fi + [ "$1" = "mysql" ] && NEED_RPM="${NEED_RPM} mysql-devel" + [ "$1" = "odbc" ] && NEED_RPM="${NEED_RPM} unixODBC-devel" [ "$1" = "pgsql" ] && NEED_RPM="${NEED_RPM} postgresql-devel" [ "$1" = "firebird" ] && NEED_RPM="${NEED_RPM} firebird-devel" [ "$1" = "freeimage" ] && NEED_RPM="${NEED_RPM} freeimage-devel" diff --git a/harbour/package/harbour-wce.spec b/harbour/package/harbour-wce.spec index dba9eda634..c44c025414 100644 --- a/harbour/package/harbour-wce.spec +++ b/harbour/package/harbour-wce.spec @@ -86,7 +86,6 @@ export HB_BUILD_PARTS=lib export HB_PLATFORM=wce export HB_BIN_COMPILE="$(pwd)/bin/linux/gcc" -export CC_HB_USER_PRGFLAGS="-undef:.ARCH. -D__PLATFORM__WINDOWS -D__PLATFORM__WINCE" make %{?_smp_mflags} @@ -104,8 +103,6 @@ unset HB_COMPILER export HB_BIN_COMPILE="$(pwd)/bin/linux/gcc" -export CC_HB_USER_PRGFLAGS="-undef:.ARCH. -D__PLATFORM__WINDOWS -D__PLATFORM__WINCE" - export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/%{name} export HB_LIB_INSTALL=%{_libdir}/%{name} diff --git a/harbour/package/harbour-win.spec b/harbour/package/harbour-win.spec index 15db01fe42..9822975eb5 100644 --- a/harbour/package/harbour-win.spec +++ b/harbour/package/harbour-win.spec @@ -86,7 +86,6 @@ export HB_BUILD_PARTS=lib export HB_PLATFORM=win export HB_BIN_COMPILE="$(pwd)/bin/linux/gcc" -export CC_HB_USER_PRGFLAGS="-undef:.ARCH. -D__PLATFORM__WINDOWS" make %{?_smp_mflags} @@ -104,8 +103,6 @@ unset HB_COMPILER export HB_BIN_COMPILE="$(pwd)/bin/linux/gcc" -export CC_HB_USER_PRGFLAGS="-undef:.ARCH. -D__PLATFORM__WINDOWS" - export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/%{name} export HB_LIB_INSTALL=%{_libdir}/%{name} diff --git a/harbour/package/harbour.spec b/harbour/package/harbour.spec index f64a9460b9..fc8b2956f9 100644 --- a/harbour/package/harbour.spec +++ b/harbour/package/harbour.spec @@ -30,12 +30,6 @@ %if "%{platform}" == "" %define platform %(release=$(rpm -q --queryformat='%{VERSION}' openSUSE-release 2>/dev/null) && echo "sus$release"|tr -d ".") %if "%{platform}" == "" -# DISCONTINUED -%define platform %(release=$(rpm -q --queryformat='%{VERSION}' conectiva-release 2>/dev/null) && echo "cl$release"|tr -d ".") -%if "%{platform}" == "" -# DISCONTINUED -%define platform %(release=$(rpm -q --queryformat='%{VERSION}' aurox-release 2>/dev/null) && echo "aur$release"|tr -d ".") -%if "%{platform}" == "" %define platform %([ -f /etc/pld-release ] && cat /etc/pld-release|sed -e '/1/ !d' -e 's/[^0-9]//g' -e 's/^/pld/') %endif %endif @@ -43,8 +37,6 @@ %endif %endif %endif -%endif -%endif %define hb_ldconf %([ -d /etc/ld.so.conf.d ] && echo /etc/ld.so.conf.d) @@ -71,7 +63,7 @@ %define hb_mdir export HB_MAN_INSTALL=${RPM_BUILD_ROOT}%{_mandir} %define hb_cmrc export HB_BUILD_NOGPLLIB=%{?_without_gpllib:yes} %define hb_ctrb export HB_BUILD_CONTRIBS="hbblink hbclipsm hbct hbgt hbmisc hbmzip hbnetio hbtip hbtpathy hbhpdf hbziparc hbfoxpro hbsms hbfship hbxpp xhb rddbmcdx rddsql sddsqlt3 hbnf %{?_with_allegro:gtalleg} %{?_with_cairo:hbcairo} %{?_with_cups:hbcups} %{?_with_curl:hbcurl} %{?_with_firebird:hbfbird sddfb} %{?_with_freeimage:hbfimage} %{?_with_gd:hbgd} %{?_with_mysql:hbmysql sddmy} %{?_with_odbc:hbodbc sddodbc} %{?_with_pgsql:hbpgsql sddpg} %{?_with_qt:hbqt hbxbp} %{?_with_ads:rddads}" -%define hb_env %{hb_plat} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_dflag} ; %{shl_path} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_local} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_edir} ; %{hb_ctrb} ; %{hb_cmrc} +%define hb_env %{hb_plat} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_dflag} ; %{shl_path} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_local} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_edir} ; %{hb_mdir} ; %{hb_ctrb} ; %{hb_cmrc} %define hb_host harbour-project.org ###################################################################### ## Preamble. @@ -414,21 +406,12 @@ make install %{?_smp_mflags} [ "%{?_without_curses:1}" ] && rm -f $HB_LIB_INSTALL/libgtcrs.a [ "%{?_without_slang:1}" ] && rm -f $HB_LIB_INSTALL/libgtsln.a +rm -f $HB_LIB_INSTALL/libbz2.a rm -f $HB_LIB_INSTALL/libjpeg.a rm -f $HB_LIB_INSTALL/liblibhpdf.a rm -f $HB_LIB_INSTALL/libpng.a rm -f $HB_LIB_INSTALL/libsqlite3.a -mkdir -p $HB_MAN_INSTALL/man1 -install -m644 src/main/*.1* $HB_MAN_INSTALL/man1/ -install -m644 src/pp/*.1* $HB_MAN_INSTALL/man1/ -install -m644 utils/hbmk2/*.1* $HB_MAN_INSTALL/man1/ -install -m644 utils/hbrun/*.1* $HB_MAN_INSTALL/man1/ -install -m644 utils/hbtest/*.1* $HB_MAN_INSTALL/man1/ - -mkdir -p $HB_ETC_INSTALL -install -m644 src/rtl/gtcrs/hb-charmap.def $HB_ETC_INSTALL/hb-charmap.def - # remove unused files rm -f $HB_BIN_INSTALL/hbtest