Merge branch 'master' into f15

Conflicts:
	.gitignore
	gnome-user-docs.spec
	sources
This commit is contained in:
Christopher Aillon 2011-05-24 07:00:47 -07:00
commit d3fb5388ea
3 changed files with 7 additions and 11 deletions

11
.gitignore vendored
View File

@ -1,9 +1,2 @@
gnome-user-docs-2.30.1.tar.bz2
/gnome-user-docs-2.32.0.tar.bz2
/gnome-user-docs-2.91.90.tar.bz2
/gnome-user-docs-2.91.91.tar.bz2
/gnome-user-docs-2.91.92.tar.bz2
/gnome-user-docs-3.0.0.tar.bz2
/gnome-user-docs-3.0.1.tar.bz2
/gnome-user-docs-3.0.2.tar.bz2
/gnome-user-docs-3.0.3.tar.bz2
/gnome-user-docs-*.tar.bz2
/gnome-user-docs-*.tar.xz

View File

@ -1,6 +1,6 @@
Summary: GNOME User Documentation
Name: gnome-user-docs
Version: 3.0.3
Version: 3.0.4
Release: 1%{?dist}
License: GFDL
#VCS: git:git://git.gnome.org/gnome-user-docs
@ -33,6 +33,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%defattr(-, root, root,-)
%changelog
* Tue May 24 2011 Christopher Aillon <caillon@redhat.com> - 3.0.4-1
- Update to 3.0.4
* Mon Apr 25 2011 Matthias Clasen <mclasen@redhat.com> - 3.0.3-1
- Update to 3.0.3

View File

@ -1 +1 @@
ee885731c5d43dd2036e3a3c4a4ad01d gnome-user-docs-3.0.3.tar.bz2
ba54b09d9ce2f8cbf83b5fa01a77cc0f gnome-user-docs-3.0.4.tar.bz2