diff --git a/.gitignore b/.gitignore index 0348624..4b73fda 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libsolv-857fe28.tar.xz +/libsolv-5702cc4.tar.xz diff --git a/libsolv-testtags.patch b/libsolv-testtags.patch new file mode 100644 index 0000000..ccbe3d7 --- /dev/null +++ b/libsolv-testtags.patch @@ -0,0 +1,34 @@ +From 2d758912039cccdf4cf9e4cef262e1a6740d7de9 Mon Sep 17 00:00:00 2001 +From: Ales Kozumplik +Date: Mon, 16 Apr 2012 08:34:04 +0200 +Subject: [PATCH] build: export the new *_testtags methods + +--- + ext/libsolvext.ver | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ext/libsolvext.ver b/ext/libsolvext.ver +index 74d2718..7c830aa 100644 +--- a/ext/libsolvext.ver ++++ b/ext/libsolvext.ver +@@ -35,7 +35,7 @@ SOLV_1.0 { + rpm_query; + solv_xfopen; + solv_xfopen_fd; +- testcase_add_susetags; ++ testcase_add_testtags; + testcase_job2str; + testcase_solvid2str; + testcase_str2dep; +@@ -45,7 +45,7 @@ SOLV_1.0 { + testcase_resultdiff; + testcase_solverresult; + testcase_write; +- testcase_write_susetags; ++ testcase_write_testtags; + local: + *; + }; +-- +1.7.7.3 + diff --git a/libsolv.spec b/libsolv.spec index 2d13c50..80ffb02 100644 --- a/libsolv.spec +++ b/libsolv.spec @@ -1,4 +1,4 @@ -%global gitrev 857fe28 +%global gitrev 5702cc4 %{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')} %filter_provides_in %{perl_vendorarch}/.*\.so$ %filter_provides_in %{python_sitearch}/.*\.so$ @@ -7,7 +7,7 @@ Name: libsolv Version: 0.0.0 -Release: 2.git%{gitrev}%{?dist} +Release: 8.git%{gitrev}%{?dist} License: BSD Url: https://github.com/openSUSE/libsolv # git clone https://github.com/openSUSE/libsolv.git @@ -15,6 +15,7 @@ Url: https://github.com/openSUSE/libsolv Source: libsolv-%{gitrev}.tar.xz Patch0: libsolv-rubyinclude.patch Patch1: libsolv-newruby.patch +Patch2: libsolv-testtags.patch Group: Development/Libraries Summary: Package dependency solver BuildRequires: cmake libdb-devel expat-devel rpm-devel zlib-devel @@ -83,6 +84,7 @@ Perl bindings for sat solver. %setup -q -n libsolv %patch0 -p1 -b .rubyinclude %patch1 -p1 -b .newruby +%patch2 -p1 -b .testtags %build %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -96,6 +98,7 @@ make %{?_smp_mflags} %install make DESTDIR=$RPM_BUILD_ROOT install +rm $RPM_BUILD_ROOT/usr/bin/testsolv %post -p /sbin/ldconfig @@ -141,6 +144,10 @@ make DESTDIR=$RPM_BUILD_ROOT install %{python_sitearch}/* %changelog +* Mon Apr 16 2012 Aleš Kozumplík - 0.0.0-8.git5702cc4%{?dist} +- Rebase. +- Fix *_testtags names. + * Tue Feb 7 2012 Karel Klíč - 0.0.0-2.git857fe28%{?dist} - Adapted to Ruby 1.9.3 (workaround for broken CMake in Fedora and ruby template correction in bindings) diff --git a/sources b/sources index 3d7626c..14a7591 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -324282413919e5ab121558a5143cd6d9 libsolv-857fe28.tar.xz +4901144b47f2cc0e580c0b494added80 libsolv-5702cc4.tar.xz