ref: refs/heads/master
commit 29b0d3cdc33786984226b0d218567d62f6ec3557
Author: Michael Andres
Date: Tue Oct 6 14:13:51 2009 +0200
Use ZyppCommon to build the package (does not include .git)
---
CMakeLists.txt | 55 ++------------------------
libzypp-bindings.spec.cmake | 90 +++++++++++++++++++++++++++++++++++++++++++
libzypp-bindings.spec.in | 90 -------------------------------------------
3 files changed, 94 insertions(+), 141 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 082b255..801fbf5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,8 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fno-strict-aliasing")
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
SET(CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules ${CMAKE_MODULE_PATH})
+INCLUDE(ZyppCommon)
+
#
# versioning, packaging
#
@@ -23,33 +25,12 @@ INCLUDE(${CMAKE_SOURCE_DIR}/VERSION.cmake)
SET( PACKAGE "libzypp-bindings" )
SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Language Bindings for libzypp")
-SET(CPACK_PACKAGE_VENDOR "Novell Inc.")
-#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/ReadMe.txt")
-#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt")
-SET(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
-SET(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
-SET(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
-
-SET( CPACK_GENERATOR "TBZ2")
-SET( CPACK_SOURCE_GENERATOR "TBZ2")
-SET( CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE}-${VERSION}" )
-
-# The following components are regex's to match anywhere (unless anchored)
-# in absolute path + filename to find files or directories to be excluded
-# from source tarball.
-SET (CPACK_SOURCE_IGNORE_FILES
-"/CVS/;/.svn/;/.libs/;/.deps/;.swp$;.#;/#;/build/"
-"~$"
-"\\\\.cvsignore$"
-"/package"
-"Makefile\\\\.in$"
-)
+GENERATE_PACKAGING(${PACKAGE} ${VERSION})
INCLUDE(CPack)
-MESSAGE(STATUS "Looking modules in ${CMAKE_MODULE_PATH}")
+MESSAGE(STATUS "Looking modules in ${CMAKE_MODULE_PATH}")
#
# Finding Swig
@@ -77,31 +58,3 @@ ENDIF( BOOST_SMARTPTR_INCLUDE_DIR )
ADD_SUBDIRECTORY(swig)
-
-#
-#
-#
-
-ADD_CUSTOM_TARGET( svncheck
- COMMAND cd $(CMAKE_SOURCE_DIR) && ! LC_ALL=C svn status --show-updates
- --quiet | grep -v '^Status against revision'
-)
-
-SET( SRCPACKAGE_COMMAND
- COMMAND ${CMAKE_MAKE_PROGRAM} package_source
- COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2 ${CMAKE_BINARY_DIR}/package/
- COMMAND ${CMAKE_COMMAND} -E remove ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2
- COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/package/${PACKAGE}.changes" "${CMAKE_BINARY_DIR}/package/${PACKAGE}.changes"
-)
-
-ADD_CUSTOM_TARGET( srcpackage_local
- ${SRCPACKAGE_COMMAND}
-)
-
-ADD_CUSTOM_TARGET( srcpackage
- COMMAND ${CMAKE_MAKE_PROGRAM} svncheck
- ${SRCPACKAGE_COMMAND}
-)
-
-MESSAGE(STATUS "Writing spec file...")
-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/libzypp-bindings.spec.in ${CMAKE_BINARY_DIR}/package/libzypp-bindings.spec @ONLY)
diff --git a/libzypp-bindings.spec.cmake b/libzypp-bindings.spec.cmake
new file mode 100644
index 0000000..23aa13e
--- /dev/null
+++ b/libzypp-bindings.spec.cmake
@@ -0,0 +1,90 @@
+#
+# spec file for package libzypp-bindings
+#
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+# nodebuginfo
+
+Name: @PACKAGE@
+Version: @VERSION@
+Release: 0
+License: GPL v2 or later
+Summary: Bindings for libzypp
+Group: Development/Sources
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: cmake gcc-c++ python-devel ruby-devel swig
+BuildRequires: libzypp-devel >= 5.8.0
+Source: %{name}-%{version}.tar.bz2
+
+%description
+This package provides bindings for libzypp, the library for package management.
+
+%prep
+%setup -q
+
+%build
+mkdir build
+cd build
+cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \
+ -DLIB=%{_lib} \
+ -DCMAKE_VERBOSE_MAKEFILE=TRUE \
+ -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=1 \
+ ..
+make %{?jobs:-j %jobs}
+
+%install
+cd build
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%package -n ruby-zypp
+Summary: Ruby bindings for libzypp
+Group: Development/Languages/Ruby
+
+%description -n ruby-zypp
+-
+
+%files -n ruby-zypp
+%defattr(-,root,root,-)
+%if 0%{?suse_version}
+%{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}/zypp.so
+%endif
+%if 0%{?mandriva_version}
+%{ruby_sitearchdir}/zypp.so
+%endif
+
+%package -n python-zypp
+Summary: Python bindings for libzypp
+Group: Development/Languages/Python
+%description -n python-zypp
+-
+
+%files -n python-zypp
+%defattr(-,root,root,-)
+%{python_sitelib}/_zypp.so
+%{python_sitelib}/zypp.py
+
+%package -n perl-zypp
+Requires: perl = %{perl_version}
+Summary: Perl bindings for libzypp
+Group: Development/Languages/Perl
+
+%description -n perl-zypp
+-
+
+%files -n perl-zypp
+%defattr(-,root,root,-)
+%{perl_vendorlib}/zypp.pm
+%{perl_vendorarch}/zypp.so
+
+%changelog
diff --git a/libzypp-bindings.spec.in b/libzypp-bindings.spec.in
deleted file mode 100644
index 23aa13e..0000000
--- a/libzypp-bindings.spec.in
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# spec file for package libzypp-bindings
-#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-# nodebuginfo
-
-Name: @PACKAGE@
-Version: @VERSION@
-Release: 0
-License: GPL v2 or later
-Summary: Bindings for libzypp
-Group: Development/Sources
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: cmake gcc-c++ python-devel ruby-devel swig
-BuildRequires: libzypp-devel >= 5.8.0
-Source: %{name}-%{version}.tar.bz2
-
-%description
-This package provides bindings for libzypp, the library for package management.
-
-%prep
-%setup -q
-
-%build
-mkdir build
-cd build
-cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \
- -DLIB=%{_lib} \
- -DCMAKE_VERBOSE_MAKEFILE=TRUE \
- -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \
- -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=1 \
- ..
-make %{?jobs:-j %jobs}
-
-%install
-cd build
-make install DESTDIR=$RPM_BUILD_ROOT
-
-%clean
-%{__rm} -rf %{buildroot}
-
-%package -n ruby-zypp
-Summary: Ruby bindings for libzypp
-Group: Development/Languages/Ruby
-
-%description -n ruby-zypp
--
-
-%files -n ruby-zypp
-%defattr(-,root,root,-)
-%if 0%{?suse_version}
-%{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}/zypp.so
-%endif
-%if 0%{?mandriva_version}
-%{ruby_sitearchdir}/zypp.so
-%endif
-
-%package -n python-zypp
-Summary: Python bindings for libzypp
-Group: Development/Languages/Python
-%description -n python-zypp
--
-
-%files -n python-zypp
-%defattr(-,root,root,-)
-%{python_sitelib}/_zypp.so
-%{python_sitelib}/zypp.py
-
-%package -n perl-zypp
-Requires: perl = %{perl_version}
-Summary: Perl bindings for libzypp
-Group: Development/Languages/Perl
-
-%description -n perl-zypp
--
-
-%files -n perl-zypp
-%defattr(-,root,root,-)
-%{perl_vendorlib}/zypp.pm
-%{perl_vendorarch}/zypp.so
-
-%changelog
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
