From a1017042382713366061faa4886d328598b4b43d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jun 23 2015 14:51:26 +0000 Subject: import libsolv-0.6.4-45.atomic.0.el7 --- diff --git a/.gitignore b/.gitignore index ae52d1e..59a07bb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libsolv-12af31a403d975552cb9131240ea2271bff496d5.tar.gz +SOURCES/libsolv-12af31a.tar.xz diff --git a/.libsolv.metadata b/.libsolv.metadata index 427e173..e2e99df 100644 --- a/.libsolv.metadata +++ b/.libsolv.metadata @@ -1 +1 @@ -7602215305b8ac1b06644844623251104e0587e3 SOURCES/libsolv-12af31a403d975552cb9131240ea2271bff496d5.tar.gz +e6b245850507345382551f509dacd6875a13bec1 SOURCES/libsolv-12af31a.tar.xz diff --git a/SOURCES/libsolv-rubyinclude.patch b/SOURCES/libsolv-rubyinclude.patch deleted file mode 100644 index 13a0b36..0000000 --- a/SOURCES/libsolv-rubyinclude.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up libsolv/bindings/ruby/CMakeLists.txt.rubyinclude libsolv/bindings/ruby/CMakeLists.txt ---- libsolv/bindings/ruby/CMakeLists.txt.rubyinclude 2012-06-07 10:06:19.372687533 +0200 -+++ libsolv/bindings/ruby/CMakeLists.txt 2012-06-07 10:09:57.313968719 +0200 -@@ -6,8 +6,17 @@ ELSE (USE_VENDORDIRS AND RUBY_VENDORARCH - SET (RUBY_INSTALL_DIR ${RUBY_SITEARCH_DIR}) - ENDIF (USE_VENDORDIRS AND RUBY_VENDORARCH_DIR) - -+EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['arch']" -+ OUTPUT_VARIABLE RUBY_ARCH) -+ -+EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir']" -+ OUTPUT_VARIABLE RUBY_HDR_DIR) -+ -+SET(RUBY_INCLUDE_DIRS ${RUBY_HDR_DIR} ${RUBY_HDR_DIR}/${RUBY_ARCH}) -+ - MESSAGE (STATUS "Ruby executable: ${RUBY_EXECUTABLE}") - MESSAGE (STATUS "Ruby installation dir: ${RUBY_INSTALL_DIR}") -+MESSAGE (STATUS "Ruby include dir: ${RUBY_INCLUDE_DIRS}") - - ADD_CUSTOM_COMMAND ( - OUTPUT solv_ruby.c -@@ -17,7 +26,7 @@ ADD_CUSTOM_COMMAND ( - ) - - ADD_DEFINITIONS(-Wno-unused) --INCLUDE_DIRECTORIES (${RUBY_INCLUDE_PATH}) -+INCLUDE_DIRECTORIES (${RUBY_INCLUDE_DIRS}) - - ADD_LIBRARY (bindings_ruby SHARED solv_ruby.c) - SET_TARGET_PROPERTIES (bindings_ruby PROPERTIES PREFIX "" OUTPUT_NAME "solv") diff --git a/SPECS/libsolv.spec b/SPECS/libsolv.spec index fcfe176..e18dd4b 100644 --- a/SPECS/libsolv.spec +++ b/SPECS/libsolv.spec @@ -1,4 +1,4 @@ -%global gitrev 12af31a403d975552cb9131240ea2271bff496d5 +%global gitrev 12af31a %{!?ruby_vendorarch: %global ruby_vendorarch %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"] ')} %filter_provides_in %{perl_vendorarch}/.*\.so$ %filter_provides_in %{python_sitearch}/.*\.so$ @@ -7,15 +7,16 @@ Name: libsolv Version: 0.6.4 -Release: 4%{?dist} +Release: 45.atomic.0%{?dist} License: BSD Url: https://github.com/openSUSE/libsolv -Source: https://github.com/openSUSE/%{name}/archive/%{gitrev}/%{name}-%{gitrev}.tar.gz -Patch0: libsolv-rubyinclude.patch +# git clone https://github.com/openSUSE/libsolv.git +# git archive %{gitrev} --prefix=libsolv/ | xz > libsolv-%{gitrev}.tar.xz +Source: libsolv-%{gitrev}.tar.xz Group: Development/Libraries Summary: Package dependency solver BuildRequires: cmake libdb-devel expat-devel rpm-devel zlib-devel -BuildRequires: swig perl perl-devel ruby ruby-devel python2-devel +BuildRequires: swig perl-devel python2-devel BuildRequires: xz-devel %description A free package dependency solver using a satisfiability algorithm. The @@ -51,49 +52,27 @@ Package dependency solver tools. Summary: Applications demoing the libsolv library Group: Development/Libraries Requires: curl gnupg2 -Requires: libsolv%{?_isa} = %{version}-%{release} %description demo Applications demoing the libsolv library. -%package -n ruby-solv -Summary: Ruby bindings for the libsolv library -Group: Development/Languages -Requires: libsolv%{?_isa} = %{version}-%{release} - -%description -n ruby-solv -Ruby bindings for sat solver. - %package -n python-solv Summary: Python bindings for the libsolv library Group: Development/Languages Requires: python -Requires: libsolv%{?_isa} = %{version}-%{release} %description -n python-solv Python bindings for sat solver. -%package -n perl-solv -Summary: Perl bindings for the libsolv library -Group: Development/Languages -Requires: perl -Requires: libsolv%{?_isa} = %{version}-%{release} - -%description -n perl-solv -Perl bindings for sat solver. - %prep -%setup -q -n %{name}-%{gitrev} -%patch0 -p1 -b .rubyinclude +%setup -q -n libsolv %check make ARGS="-V" test %build %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DENABLE_PERL=1 \ -DENABLE_PYTHON=1 \ - -DENABLE_RUBY=1 \ -DUSE_VENDORDIRS=1 \ -DFEDORA=1 \ -DENABLE_DEBIAN=1 \ @@ -142,28 +121,28 @@ rm $RPM_BUILD_ROOT/usr/bin/testsolv %files demo %_bindir/solv -%files -n perl-solv -%doc examples/p5solv -%{perl_vendorarch}/* - -%files -n ruby-solv -%doc examples/rbsolv -%{ruby_vendorarch}/* - %files -n python-solv %doc examples/pysolv %{python_sitearch}/* %changelog +* Mon May 18 2015 Colin Walters - 0.6.4-45.atomic.0 +- Drop unused patch + +* Mon May 18 2015 Colin Walters - 0.6.4-43.atomic.0 +- Increase RPM revision arbitrarily to be newer than an internal candidate build + to avoid hitting process issues. -* Thu Jan 15 2015 Radek Holý - 0.6.4-4 -- Add explicit requires on libsolv to the subpackages. +* Thu May 14 2015 Colin Walters +- Rebase to current EPEL7: http://pkgs.fedoraproject.org/cgit/libsolv.git/commit/?h=epel7&id=1b7c9c6efd2098cf6747b96f70b7472f1888ea9d -* Tue Dec 9 2014 Radek Holý - 0.6.4-3 -- Make the spec file compatible with GitHub packaging guideliness. +* Fri Dec 19 2014 Colin Walters - 0.4.1-5.atomic.3gitbcedc98 +- Rebuild for 7.1 -* Wed Sep 3 2014 Aleš Kozumplík - 0.6.4-2 -- Rebase to upstream 12af31a +* Tue Jun 24 2014 Colin Walters +- Drop off ruby and perl bindings; nothing uses them + This was breaking repoclosure as perl-solv required a Python + module not in mainline RHEL7. * Mon Dec 16 2013 Aleš Kozumplík - 0.4.1-1.gitbcedc98 - Rebase upstream bcedc98