Merge branch 'master' into f17

This commit is contained in:
Jan Horak 2012-11-29 16:08:17 +01:00
commit 0e1808949c
3 changed files with 7 additions and 3 deletions

1
.gitignore vendored
View file

@ -39,3 +39,4 @@ xulrunner-1.9.3.0b3.source.tar.bz2
/xulrunner-17.0b6.source.tar.bz2
/firefox-17.0.source.tar.bz2
/xulrunner-17.0.source.tar.bz2
/xulrunner-17.0.1.source.tar.bz2

View file

@ -1 +1 @@
f40d59db4101b1d0b780aecb89994da2 xulrunner-17.0.source.tar.bz2
13d616028eb77de927c29b6655c832c9 xulrunner-17.0.1.source.tar.bz2

View file

@ -74,8 +74,8 @@
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
Version: 17.0
Release: 4%{?pre_tag}%{?dist}
Version: 17.0.1
Release: 1%{?pre_tag}%{?dist}
URL: http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@ -505,6 +505,9 @@ fi
#---------------------------------------------------------------------
%changelog
* Thu Nov 29 2012 Jan Horak <jhorak@redhat.com> - 17.0.1-1
- Update to 17.0.1
* Tue Nov 27 2012 Jan Horak <jhorak@redhat.com> - 17.0-4
- Rebuild agains older NSS