fix merge

This commit is contained in:
Peter Robinson 2011-09-20 10:56:05 +01:00
commit 6a805b2ae1

View File

@ -2,7 +2,7 @@
Name: clutter-gtk
Version: 1.0.2
Release: 2%{?dist}
Release: 3%{?dist}
Summary: A basic GTK clutter widget
Group: Development/Languages
@ -63,6 +63,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_datadir}/gtk-doc/html/clutter-gtk-1.0
%changelog
* Tue Sep 20 2011 Peter Robinson <pbrobinson@fedoraproject.org> - 1.0.2-3
- Rebuild for clutter 1.8.0
* Tue Jul 26 2011 Matthias Clasen <mclasen@redhat.com> 1.0.2-2
- Rebuild
@ -87,7 +90,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
* Fri Jan 7 2011 Matthias Clasen <mclasen@redhat.com> 0.91.6-2
- Rebuild against GTK+ 2.99.0
* Tue Dec 28 2010 Peter Robinson <pbrobinson@gmail.com> 0.91.6-1
* Tue Dec 28 2010 Peter Robinson <pbrobinson@fedoraproject.org> 0.91.6-1
- Update to 0.91.6
- Fix deps and other bits of spec file
@ -97,29 +100,29 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
* Thu Nov 11 2010 Matthias Clasen <mclasen@redhat.com> - 0.91.4-1
- Update to 0.91.4
* Sun Oct 10 2010 Peter Robinson <pbrobinson@gmail.com> 0.91.2-1
* Sun Oct 10 2010 Peter Robinson <pbrobinson@fedoraproject.org> 0.91.2-1
- Update to 0.91.2
* Wed Sep 29 2010 Peter Robinson <pbrobinson@gmail.com> 0.90.2-3
* Wed Sep 29 2010 Peter Robinson <pbrobinson@fedoraproject.org> 0.90.2-3
- Add upstream patches to compile with latest gobject-introspection
* Tue Sep 21 2010 Matthias Clasen <mclasen@redhat.com> 0.90.2-2
- Rebuild against newer gobject-introspection
* Wed Sep 1 2010 Peter Robinson <pbrobinson@gmail.com> 0.90.2-1
* Wed Sep 1 2010 Peter Robinson <pbrobinson@fedoraproject.org> 0.90.2-1
- Update to 0.90.2
* Thu Jul 15 2010 Colin Walters <walters@verbum.org> - 0.10.4-5
- Rebuild with new gobject-introspection
- Drop gir-repository-devel
* Mon May 3 2010 Peter Robinson <pbrobinson@gmail.com> 0.10.4-3
* Mon May 3 2010 Peter Robinson <pbrobinson@fedoraproject.org> 0.10.4-3
- cleanup removal of libtool archives
* Wed Mar 24 2010 Bastien Nocera <bnocera@redhat.com> 0.10.4-2
- Move the API docs to -devel
* Sun Mar 21 2010 Peter Robinson <pbrobinson@gmail.com> 0.10.4-1
* Sun Mar 21 2010 Peter Robinson <pbrobinson@fedoraproject.org> 0.10.4-1
- Update to 0.10.4
* Wed Jul 29 2009 Bastien Nocera <bnocera@redhat.com> 0.10.2-1