This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via d7d59bf3e02f1c4eeca934c377b63299f047fe88 (commit) via 8c579d914022f4233e638d4a7574461da173ba84 (commit) via 7e33d2a007487ba381c07e9608c8e0fa74899c91 (commit) via 4d5df8739cdadfe4266d483340ed4e2742b77c77 (commit) from 71d190beec587b8dfea7d93e5db6d10141b3cd9c (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit d7d59bf3e02f1c4eeca934c377b63299f047fe88 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Apr 29 20:53:40 2011 +0200

python-satsolver: New package.

commit 8c579d914022f4233e638d4a7574461da173ba84 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Apr 29 20:53:06 2011 +0200

libsatsolver: Fix build for GCC 4.6 + fix link error.

commit 7e33d2a007487ba381c07e9608c8e0fa74899c91 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Apr 29 20:52:36 2011 +0200

cmake: Update to 2.8.4.

Requires libarchive.

commit 4d5df8739cdadfe4266d483340ed4e2742b77c77 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Apr 29 20:52:21 2011 +0200

libarchive: New package.

Needed by cmake 2.8.4.

-----------------------------------------------------------------------

Summary of changes: pkgs/cmake/cmake.nm | 5 ++- .../dbus-glib.nm => libarchive/libarchive.nm} | 36 ++++++++----------- pkgs/libsatsolver/libsatsolver.nm | 12 ++++++- .../patches/fix-building-without-rpm.patch | 37 ++++++++++++++++++++ .../python-satsolver-only-python-bindings.patch | 27 ++++++++++++++ .../python-satsolver.nm} | 27 ++++++++------ 6 files changed, 108 insertions(+), 36 deletions(-) copy pkgs/{dbus-glib/dbus-glib.nm => libarchive/libarchive.nm} (72%) create mode 100644 pkgs/python-satsolver/patches/fix-building-without-rpm.patch create mode 100644 pkgs/python-satsolver/patches/python-satsolver-only-python-bindings.patch copy pkgs/{libsatsolver/libsatsolver.nm => python-satsolver/python-satsolver.nm} (75%)

Difference in files: diff --git a/pkgs/cmake/cmake.nm b/pkgs/cmake/cmake.nm index 4370155..e49bb14 100644 --- a/pkgs/cmake/cmake.nm +++ b/pkgs/cmake/cmake.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include

PKG_NAME = cmake -PKG_VER = 2.8.2 +PKG_VER = 2.8.4 PKG_REL = 1

PKG_MAINTAINER = @@ -34,7 +34,8 @@ PKG_URL = http://www.cmake.org PKG_LICENSE = BSD PKG_SUMMARY = Cross-platform make system.

-PKG_BUILD_DEPS+= expat-devel gcc-c++ libcurl-devel ncurses-devel openssl-devel zlib-devel +PKG_BUILD_DEPS+= expat-devel gcc-c++ libarchive-devel libcurl-devel \ + ncurses-devel openssl-devel zlib-devel

# Add some fixes to work with lto. CFLAGS += -Wl,-lpthread diff --git a/pkgs/libarchive/libarchive.nm b/pkgs/libarchive/libarchive.nm new file mode 100644 index 0000000..65c59bc --- /dev/null +++ b/pkgs/libarchive/libarchive.nm @@ -0,0 +1,58 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = libarchive +PKG_VER = 2.8.4 +PKG_REL = 1 + +PKG_MAINTAINER = +PKG_GROUPS = System/Libraries +PKG_URL = http://code.google.com/p/libarchive/ +PKG_LICENSE = BSD +PKG_SUMMARY = A library for handling streaming archive formats. + +PKG_BUILD_DEPS+= bison bzip2-devel e2fsprogs-devel libacl-devel libattr-devel \ + libxml2-devel openssl-devel xz-devel zlib-devel + +define PKG_DESCRIPTION + Libarchive is a programming library that can create and read several different + streaming archive formats, including most popular tar variants, several cpio + formats, and both BSD and GNU ar variants. It can also write shar archives and + read ISO9660 CDROM images and ZIP archives. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +PKG_PACKAGES += $(PKG_NAME)-devel + +CONFIGURE_OPTIONS += \ + --disable-static \ + --disable-bsdtar \ + --disable-bsdcpio + +define STAGE_INSTALL_CMDS + rm -rfv $(BUILDROOT)/usr/share/man/man5/{cpio,mtree,tar}.5 +endef diff --git a/pkgs/libsatsolver/libsatsolver.nm b/pkgs/libsatsolver/libsatsolver.nm index d726cee..243e944 100644 --- a/pkgs/libsatsolver/libsatsolver.nm +++ b/pkgs/libsatsolver/libsatsolver.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = libsatsolver PKG_VER = 0.16.4 -PKG_REL = 2 +PKG_REL = 3

PKG_MAINTAINER = PKG_GROUPS = System/Libraries @@ -44,6 +44,16 @@ PKG_TARBALL = $(THISAPP).tar.bz2

PKG_PACKAGES += $(PKG_NAME)-devel

+define STAGE_PREPARE_CMDS + # Who releases code with -Werror? + cd $(DIR_APP) && sed -e "s/-Werror//g" -i CMakeLists.txt + + # Make sure that libsatsolverext is linked properly to all needed + # libraries. + cd $(DIR_APP) && echo "TARGET_LINK_LIBRARIES(satsolverext satsolver $${EXPAT_LIBRARY} $${ZLIB_LIBRARY})" \ + >> ext/CMakeLists.txt +endef + # Define debian as distro to get weak of rpm header files. define STAGE_BUILD cd $(DIR_APP) && mkdir build diff --git a/pkgs/python-satsolver/patches/fix-building-without-rpm.patch b/pkgs/python-satsolver/patches/fix-building-without-rpm.patch new file mode 100644 index 0000000..68e2767 --- /dev/null +++ b/pkgs/python-satsolver/patches/fix-building-without-rpm.patch @@ -0,0 +1,37 @@ +diff -Nur src/bindings/pool.i sat-solver-bindings/bindings/pool.i +--- src/bindings/pool.i 2011-04-25 12:03:31.000000000 +0000 ++++ sat-solver-bindings/bindings/pool.i 2011-04-29 18:40:59.645929695 +0000 +@@ -474,6 +474,7 @@ + return repo; + } + ++#if defined(FEDORA) + /* + * Add RPM database to Pool. + * +@@ -493,6 +494,7 @@ + repo_add_rpmdb( repo, NULL, rootdir, 0 ); + return repo; + } ++#endif + + %newobject create_repo; + /* +diff -Nur src/bindings/repo.i sat-solver-bindings/bindings/repo.i +--- src/bindings/repo.i 2011-04-25 12:03:31.000000000 +0000 ++++ sat-solver-bindings/bindings/repo.i 2011-04-29 18:37:13.856570319 +0000 +@@ -139,11 +139,13 @@ + } + } + ++#if defined(FEDORA) + /* + * Add RPM database, optionally passing a _root_ directory + */ + void add_rpmdb( const char *rootdir ) + { repo_add_rpmdb( $self, NULL, rootdir, 0); } ++#endif + + /* + * Create solvable with +name+ and +evr+ in the Repo + diff --git a/pkgs/python-satsolver/patches/python-satsolver-only-python-bindings.patch b/pkgs/python-satsolver/patches/python-satsolver-only-python-bindings.patch new file mode 100644 index 0000000..36905d0 --- /dev/null +++ b/pkgs/python-satsolver/patches/python-satsolver-only-python-bindings.patch @@ -0,0 +1,27 @@ +diff -Nur old/bindings/CMakeLists.txt new/bindings/CMakeLists.txt +--- old/bindings/CMakeLists.txt 2011-04-11 22:51:37.891109001 +0200 ++++ new/bindings/CMakeLists.txt 2011-04-11 22:55:52.859108992 +0200 +@@ -21,17 +21,17 @@ + #FIND_PACKAGE(PerlLibs) + FIND_PACKAGE(Perl) + +-IF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) +- ADD_SUBDIRECTORY(ruby) +-ENDIF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH) ++#IF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) ++# ADD_SUBDIRECTORY(ruby) ++#ENDIF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH) + + IF (PYTHON_LIBRARY) + ADD_SUBDIRECTORY(python) + ENDIF(PYTHON_LIBRARY) + +-IF (PERL_EXECUTABLE) +- ADD_SUBDIRECTORY(perl) +-ENDIF (PERL_EXECUTABLE) ++#IF (PERL_EXECUTABLE) ++# ADD_SUBDIRECTORY(perl) ++#ENDIF (PERL_EXECUTABLE) + + SET(bindings_devel_dir "${CMAKE_CURRENT_BINARY_DIR}/satsolver-bindings") + ADD_CUSTOM_COMMAND ( diff --git a/pkgs/python-satsolver/python-satsolver.nm b/pkgs/python-satsolver/python-satsolver.nm new file mode 100644 index 0000000..c0c4838 --- /dev/null +++ b/pkgs/python-satsolver/python-satsolver.nm @@ -0,0 +1,62 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = python-satsolver +PKG_VER = 0.16.0-20110429-868eae9 +PKG_REL = 1 + +PKG_MAINTAINER = +PKG_GROUPS = System/Libraries +PKG_URL = https://gitorious.org/+opensuse-developers/opensuse/sat-solver-bindings +PKG_LICENSE = BSD +PKG_SUMMARY = libsatsolver python bindings. + +PKG_BUILD_DEPS+= cmake gcc-c++ expat-devel libsatsolver-devel>=0.16.4-3 \ + python-devel swig zlib-devel + +define PKG_DESCRIPTION + libsatsolver python bindings for use with python programs. +endef + +PKG_TARBALL = sat-solver-bindings-$(PKG_VER).tar.xz + +DIR_APP = $(DIR_SRC) + +define STAGE_BUILD + cd $(DIR_APP) && mkdir build + cd $(DIR_APP)/build && cmake .. \ + -DDEBIAN=1 \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=1 + cd $(DIR_APP)/build && make $(PARALELLISMFLAGS) +endef + +define STAGE_INSTALL + # Install only the python bindings. That's all we need. + cd $(DIR_APP)/build/bindings/python && \ + make install DESTDIR=$(BUILDROOT) +endef

hooks/post-receive -- IPFire 3.x development tree