OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [email protected] Module: openpkg-src Date: 30-Apr-2009 23:54:11 Branch: HEAD Handle: 2009043022541100 Modified files: openpkg-src/cfengine cfengine.spec Removed files: openpkg-src/cfengine cfengine.patch Log: upgrading package: cfengine 2.2.8 -> 3.0.1 Summary: Revision Changes Path 1.15 +0 -39 openpkg-src/cfengine/cfengine.patch 1.83 +16 -12 openpkg-src/cfengine/cfengine.spec ____________________________________________________________________________ rm -f openpkg-src/cfengine/cfengine.patch <<'@@ .' Index: openpkg-src/cfengine/cfengine.patch ============================================================================ [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . patch -p0 <<'@@ .' Index: openpkg-src/cfengine/cfengine.spec ============================================================================ $ cvs diff -u -r1.82 -r1.83 cfengine.spec --- openpkg-src/cfengine/cfengine.spec 18 Apr 2009 13:09:14 -0000 1.82 +++ openpkg-src/cfengine/cfengine.spec 30 Apr 2009 21:54:11 -0000 1.83 @@ -31,8 +31,8 @@ Class: BASE Group: System License: GPL -Version: 2.2.8 -Release: 20080805 +Version: 3.0.1 +Release: 20090430 # package options %option with_fsl yes @@ -41,15 +41,14 @@ Source0: http://www.cfengine.org/downloads/cfengine-%{version}.tar.gz Source1: rc.cfengine Source2: fsl.cfengine -Patch0: cfengine.patch # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 20060823, bison, flex, gcc PreReq: OpenPKG, openpkg >= 20060823 -BuildPreReq: db, openssl -PreReq: db, openssl +BuildPreReq: db, openssl, pcre +PreReq: db, openssl, pcre %if "%{with_fsl}" == "yes" BuildPreReq: fsl PreReq: fsl @@ -76,7 +75,6 @@ %prep %setup -q - %patch -p0 %build # configure package @@ -88,14 +86,18 @@ esac CC="%{l_cc}" \ CFLAGS="%{l_cflags -O}" \ - CPPLAGS="%{l_cppflags}" \ + CPPFLAGS="%{l_cppflags postgresql .}" \ LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \ LIBS="%{l_fsl_libs} $loclibs" \ ./configure \ --prefix=%{l_prefix} \ + --mandir=%{l_prefix}/man \ + --infodir=%{l_prefix}/info \ + --with-workdir=%{l_prefix}/var/cfengine \ --with-berkeleydb=%{l_prefix} \ --with-openssl=%{l_prefix} \ - --with-workdir=%{l_prefix}/var/cfengine + --with-pcre=%{l_prefix} \ + --without-sql # build package %{l_make} %{l_mflags} @@ -104,11 +106,13 @@ # install package rm -rf $RPM_BUILD_ROOT %{l_shtool} mkdir -f -p -m 755 \ - $RPM_BUILD_ROOT%{l_prefix}/var/cfengine \ - $RPM_BUILD_ROOT%{l_prefix}/man/man8 + $RPM_BUILD_ROOT%{l_prefix}/var/cfengine %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" - %{l_shtool} install -c -m 644 \ - doc/*.8 $RPM_BUILD_ROOT%{l_prefix}/man/man8/ + + # strip down installation + rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc >/dev/null 2>&1 || true + rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/lib* >/dev/null 2>&1 || true + rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir >/dev/null 2>&1 || true strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true # install run-command script @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List [email protected]
