[CVS] RPM: rpm/ devtool.conf

2012-04-06 Thread Anders F. Bj�rklund 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. Björklund
  Root:   /v/rpm/cvs   Email:  a...@rpm5.org
  Module: rpm  Date:   06-Apr-2012 12:22:04
  Branch: HEAD Handle: 2012040610220400

  Modified files:
rpm devtool.conf

  Log:
- devtool: sync ports with 5.4.9

  Summary:
RevisionChanges Path
2.382   +6  -6  rpm/devtool.conf
  

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.381 -r2.382 devtool.conf
  --- rpm/devtool.conf  30 Aug 2011 12:13:46 -  2.381
  +++ rpm/devtool.conf  6 Apr 2012 10:22:04 -   2.382
  @@ -2621,7 +2621,7 @@
#   autoconf
#   libiconv
#   gettext
  - #   db51
  + #   db53
#   sqlite3
#   popt
#   beecrypt
  @@ -2642,8 +2642,8 @@
PATH=${prefix}/bin:$PATH
%autogen
CPPFLAGS="-I${prefix}/include -I${prefix}/include/xar \
  -   -I${prefix}/include/ossp -I${prefix}/include/db51"
  - LDFLAGS="-L${prefix}/lib -L${prefix}/lib/db51"
  +   -I${prefix}/include/ossp -I${prefix}/include/db53"
  + LDFLAGS="-L${prefix}/lib -L${prefix}/lib/db53"
export CPPFLAGS
export LDFLAGS
__PYTHON=${prefix}/bin/python2.6
  @@ -2695,7 +2695,7 @@
#  *textproc/syck
#   lang/perl5.10
#   lang/python26
  - #   databases/db51  SQL=on
  + #   databases/db5   SQL=on
#   databases/sqlite3   EXTENSION=on
#   devel/popt  >= 1.15
#   security/beecrypt   >= 4.2.1
  @@ -2713,8 +2713,8 @@
sed -i -E -e "s:\$(libdir)/pkgconfig:${PREFIX}/libdata/pkgconfig:" \
scripts/Makefile.in
CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/xar \
  -   -I${LOCALBASE}/include/db51"
  - LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/db51"
  +   -I${LOCALBASE}/include/db5"
  + LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/db5"
export CPPFLAGS
export LDFLAGS
%configure \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ devtool.conf

2012-04-06 Thread Anders F. Bj�rklund 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. Björklund
  Root:   /v/rpm/cvs   Email:  a...@rpm5.org
  Module: rpm  Date:   06-Apr-2012 12:19:21
  Branch: rpm-5_4  Handle: 2012040610192100

  Modified files:   (Branch: rpm-5_4)
rpm devtool.conf

  Log:
ports: change to db5

  Summary:
RevisionChanges Path
2.365.2.53  +3  -3  rpm/devtool.conf
  

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.365.2.52 -r2.365.2.53 devtool.conf
  --- rpm/devtool.conf  6 Apr 2012 10:18:37 -   2.365.2.52
  +++ rpm/devtool.conf  6 Apr 2012 10:19:21 -   2.365.2.53
  @@ -2902,7 +2902,7 @@
#  *textproc/syck
#   lang/perl5.10
#   lang/python26
  - #   databases/db51  SQL=on
  + #   databases/db5   SQL=on
#   databases/sqlite3   EXTENSION=on
#   devel/popt  >= 1.15
#   security/beecrypt   >= 4.2.1
  @@ -2919,8 +2919,8 @@
sed -i -E -e "s:\$(libdir)/pkgconfig:${PREFIX}/libdata/pkgconfig:" \
scripts/Makefile.in
CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/xar \
  -   -I${LOCALBASE}/include/db51"
  - LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/db51"
  +   -I${LOCALBASE}/include/db5"
  + LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/db5"
export CPPFLAGS
export LDFLAGS
%configure \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ devtool.conf

2012-04-06 Thread Anders F. Bj�rklund 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. Björklund
  Root:   /v/rpm/cvs   Email:  a...@rpm5.org
  Module: rpm  Date:   06-Apr-2012 12:18:38
  Branch: rpm-5_4  Handle: 2012040610183700

  Modified files:   (Branch: rpm-5_4)
rpm devtool.conf

  Log:
macports: upgrade to rpm53

  Summary:
RevisionChanges Path
2.365.2.52  +3  -3  rpm/devtool.conf
  

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.365.2.51 -r2.365.2.52 devtool.conf
  --- rpm/devtool.conf  6 Apr 2012 10:17:24 -   2.365.2.51
  +++ rpm/devtool.conf  6 Apr 2012 10:18:37 -   2.365.2.52
  @@ -2830,7 +2830,7 @@
#   autoconf
#   libiconv
#   gettext
  - #   db51
  + #   db53
#   sqlite3
#   popt
#   beecrypt
  @@ -2850,8 +2850,8 @@
PATH=${prefix}/bin:$PATH
%autogen
CPPFLAGS="-I${prefix}/include -I${prefix}/include/xar \
  -   -I${prefix}/include/ossp -I${prefix}/include/db51"
  - LDFLAGS="-L${prefix}/lib -L${prefix}/lib/db51"
  +   -I${prefix}/include/ossp -I${prefix}/include/db53"
  + LDFLAGS="-L${prefix}/lib -L${prefix}/lib/db53"
export CPPFLAGS
export LDFLAGS
__PYTHON=${prefix}/bin/python2.6
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ devtool.conf

2012-04-06 Thread Anders F. Bj�rklund 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. Björklund
  Root:   /v/rpm/cvs   Email:  a...@rpm5.org
  Module: rpm  Date:   06-Apr-2012 12:17:24
  Branch: rpm-5_4  Handle: 2012040610172400

  Modified files:   (Branch: rpm-5_4)
rpm devtool.conf

  Log:
macports: disable openmp (backport check-in 16097)

  Summary:
RevisionChanges Path
2.365.2.51  +2  -1  rpm/devtool.conf
  

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.365.2.50 -r2.365.2.51 devtool.conf
  --- rpm/devtool.conf  1 Apr 2012 18:41:03 -   2.365.2.50
  +++ rpm/devtool.conf  6 Apr 2012 10:17:24 -   2.365.2.51
  @@ -2881,7 +2881,8 @@
--sysconfdir=${prefix}/etc \
--with-path-cfg=${prefix}/etc/rpm \
--enable-broken-chown \
  - --disable-rpath
  + --disable-rpath \
  + --disable-openmp
   
   %freebsd
   %checkout
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org