Merge branch 'f21' into f20

This commit is contained in:
Igor Gnatenko 2014-11-14 23:07:34 +03:00
commit 2bd09cf82b
3 changed files with 7 additions and 3 deletions

1
.gitignore vendored
View File

@ -85,3 +85,4 @@ mesa-20100720.tar.bz2
/mesa-20140906.tar.xz /mesa-20140906.tar.xz
/mesa-20140927.tar.xz /mesa-20140927.tar.xz
/mesa-20141028.tar.xz /mesa-20141028.tar.xz
/mesa-20141110.tar.xz

View File

@ -48,13 +48,13 @@
%define _default_patch_fuzz 2 %define _default_patch_fuzz 2
%define gitdate 20141028 %define gitdate 20141110
#% define githash c2867f5b3626157379ef0d4d5bcaf5180ca0ec1f #% define githash c2867f5b3626157379ef0d4d5bcaf5180ca0ec1f
%define git %{?githash:%{githash}}%{!?githash:%{gitdate}} %define git %{?githash:%{githash}}%{!?githash:%{gitdate}}
Summary: Mesa graphics libraries Summary: Mesa graphics libraries
Name: mesa Name: mesa
Version: 10.3.2 Version: 10.3.3
Release: 1.%{git}%{?dist} Release: 1.%{git}%{?dist}
License: MIT License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
@ -679,6 +679,9 @@ rm -rf $RPM_BUILD_ROOT
# Generate changelog using: # Generate changelog using:
# git log old_commit_sha..new_commit_sha --format="- %H: %s (%an)" # git log old_commit_sha..new_commit_sha --format="- %H: %s (%an)"
%changelog %changelog
* Mon Nov 10 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.3.3-1.20141110
- 10.3.3
* Tue Oct 28 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.3.2-1.20141028 * Tue Oct 28 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.3.2-1.20141028
- 10.3.2 - 10.3.2

View File

@ -1 +1 @@
48907f62bad73fc52666c5286c3ebcee mesa-20141028.tar.xz c8d1ec99fe92b195fe2467555288dc17 mesa-20141110.tar.xz