rebase to 05baf54

This commit is contained in:
Jan Silhan 2014-04-09 19:53:12 +02:00
parent d7e2afdf2e
commit 3cda311a54
3 changed files with 8 additions and 4 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/libsolv-4442b7f.tar.xz /libsolv-4442b7f.tar.xz
/libsolv-a8e47f1.tar.xz /libsolv-a8e47f1.tar.xz
/libsolv-bcedc98.tar.xz /libsolv-bcedc98.tar.xz
/libsolv-05baf54.tar.gz

View File

@ -1,4 +1,4 @@
%global gitrev bcedc98 %global gitrev 05baf54
%{!?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$
@ -6,8 +6,8 @@
%filter_setup %filter_setup
Name: libsolv Name: libsolv
Version: 0.4.1 Version: 0.6.0
Release: 1.git%{gitrev}%{?dist} Release: 0.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
@ -154,6 +154,9 @@ rm $RPM_BUILD_ROOT/usr/bin/testsolv
%changelog %changelog
* Wed Apr 9 2014 Jan Silhan <jsilhan@redhat.com> - 0.4.1-0.git05baf54
- Rebase to 0.6.0, upstream commit 05baf54.
* Mon Dec 16 2013 Aleš Kozumplík <akozumpl@redhat.com> - 0.4.1-1.gitbcedc98 * Mon Dec 16 2013 Aleš Kozumplík <akozumpl@redhat.com> - 0.4.1-1.gitbcedc98
- Rebase upstream bcedc98 - Rebase upstream bcedc98
- Fix RhBug:1051917. - Fix RhBug:1051917.

View File

@ -1 +1 @@
c7c083898d102e86f59f236caa05d765 libsolv-bcedc98.tar.xz 2e9bb3ee248c094629e9c761c3b5d3c5 libsolv-05baf54.tar.gz