rebase to upstream 209e9cb

This commit is contained in:
Ales Kozumplik 2013-06-20 17:17:47 +02:00
parent b532c3f93c
commit ccc9ddf536
3 changed files with 9 additions and 3 deletions

1
.gitignore vendored
View File

@ -9,3 +9,4 @@
/libsolv-f663ca2.tar.xz /libsolv-f663ca2.tar.xz
/libsolv-e372b78.tar.xz /libsolv-e372b78.tar.xz
/libsolv-7399ad1.tar.xz /libsolv-7399ad1.tar.xz
/libsolv-209e9cb.tar.xz

View File

@ -1,4 +1,4 @@
%global gitrev 7399ad1 %global gitrev 209e9cb
%{!?ruby_vendorarch: %global ruby_vendorarch %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"] ')} %{!?ruby_vendorarch: %global ruby_vendorarch %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"] ')}
%filter_provides_in %{perl_vendorarch}/.*\.so$ %filter_provides_in %{perl_vendorarch}/.*\.so$
%filter_provides_in %{python_sitearch}/.*\.so$ %filter_provides_in %{python_sitearch}/.*\.so$
@ -7,7 +7,7 @@
Name: libsolv Name: libsolv
Version: 0.3.0 Version: 0.3.0
Release: 3.git%{gitrev}%{?dist} Release: 4.git%{gitrev}%{?dist}
License: BSD License: BSD
Url: https://github.com/openSUSE/libsolv Url: https://github.com/openSUSE/libsolv
# git clone https://github.com/openSUSE/libsolv.git # git clone https://github.com/openSUSE/libsolv.git
@ -127,6 +127,7 @@ rm $RPM_BUILD_ROOT/usr/bin/testsolv
%_libdir/libsolvext.so %_libdir/libsolvext.so
%_includedir/solv %_includedir/solv
%_datadir/cmake/Modules/FindLibSolv.cmake %_datadir/cmake/Modules/FindLibSolv.cmake
%{_mandir}/man?/*
%files demo %files demo
%_bindir/solv %_bindir/solv
@ -144,6 +145,10 @@ rm $RPM_BUILD_ROOT/usr/bin/testsolv
%{python_sitearch}/* %{python_sitearch}/*
%changelog %changelog
* Thu Jun 20 2013 Aleš Kozumplík <akozumpl@redhat.com> - 0.3.0-4.git209e9cb
- Rebase to upstream 209e9cb.
- Package the new man pages.
* Wed May 16 2013 Aleš Kozumplík <akozumpl@redhat.com> - 0.3.0-3.git7399ad1 * Wed May 16 2013 Aleš Kozumplík <akozumpl@redhat.com> - 0.3.0-3.git7399ad1
- Run 'make test' with libsolv build. - Run 'make test' with libsolv build.

View File

@ -1 +1 @@
83a36e7415f64f199bfd3d5849e59e7b libsolv-7399ad1.tar.xz 0c2107032e2a67e9dc9d3e4597f9d514 libsolv-209e9cb.tar.xz