From ccc9ddf536ce4750a6f9dde27a9613f6bb69d7bb Mon Sep 17 00:00:00 2001 From: Ales Kozumplik Date: Thu, 20 Jun 2013 17:17:47 +0200 Subject: [PATCH] rebase to upstream 209e9cb --- .gitignore | 1 + libsolv.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3eab364..d656026 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /libsolv-f663ca2.tar.xz /libsolv-e372b78.tar.xz /libsolv-7399ad1.tar.xz +/libsolv-209e9cb.tar.xz diff --git a/libsolv.spec b/libsolv.spec index a47f821..e5af657 100644 --- a/libsolv.spec +++ b/libsolv.spec @@ -1,4 +1,4 @@ -%global gitrev 7399ad1 +%global gitrev 209e9cb %{!?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,7 +7,7 @@ Name: libsolv Version: 0.3.0 -Release: 3.git%{gitrev}%{?dist} +Release: 4.git%{gitrev}%{?dist} License: BSD Url: https://github.com/openSUSE/libsolv # git clone https://github.com/openSUSE/libsolv.git @@ -127,6 +127,7 @@ rm $RPM_BUILD_ROOT/usr/bin/testsolv %_libdir/libsolvext.so %_includedir/solv %_datadir/cmake/Modules/FindLibSolv.cmake +%{_mandir}/man?/* %files demo %_bindir/solv @@ -144,6 +145,10 @@ rm $RPM_BUILD_ROOT/usr/bin/testsolv %{python_sitearch}/* %changelog +* Thu Jun 20 2013 Aleš Kozumplík - 0.3.0-4.git209e9cb +- Rebase to upstream 209e9cb. +- Package the new man pages. + * Wed May 16 2013 Aleš Kozumplík - 0.3.0-3.git7399ad1 - Run 'make test' with libsolv build. diff --git a/sources b/sources index d2b5882..71d5896 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -83a36e7415f64f199bfd3d5849e59e7b libsolv-7399ad1.tar.xz +0c2107032e2a67e9dc9d3e4597f9d514 libsolv-209e9cb.tar.xz