rpms/gtk2/devel .cvsignore, 1.123, 1.124 gtk2.spec, 1.425, 1.426 sources, 1.133, 1.134
Matthias Clasen
mclasen at fedoraproject.org
Wed Mar 10 05:33:59 UTC 2010
Author: mclasen
Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27728
Modified Files:
.cvsignore gtk2.spec sources
Log Message:
2.19.7
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- .cvsignore 23 Feb 2010 21:30:00 -0000 1.123
+++ .cvsignore 10 Mar 2010 05:33:58 -0000 1.124
@@ -1 +1 @@
-gtk+-2.19.6.tar.bz2
+gtk+-2.19.7.tar.bz2
Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -p -r1.425 -r1.426
--- gtk2.spec 23 Feb 2010 21:30:01 -0000 1.425
+++ gtk2.spec 10 Mar 2010 05:33:58 -0000 1.426
@@ -13,7 +13,7 @@
%define gobject_introspection_version 0.6.7
%define gir_repository_version 0.6.5-5
-%define base_version 2.19.6
+%define base_version 2.19.7
%define bin_version 2.10.0
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
@@ -22,6 +22,7 @@ Version: %{base_version}
Release: 1%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
+#VCS: git:git://git.gnome.org/gtk+
Source: http://download.gnome.org/sources/gtk+/2.19/gtk+-%{version}.tar.bz2
Source1: update-gdk-pixbuf-loaders
Source2: update-gtk-immodules
@@ -40,8 +41,6 @@ Patch8: tooltip-positioning.patch
Patch11: gtk2-remove-connecting-reason.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=592582
#Patch14: gtk2-landscape-pdf-print.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=600992
-Patch15: filesystemref.patch
BuildRequires: atk-devel >= %{atk_version}
BuildRequires: pango-devel >= %{pango_version}
@@ -161,17 +160,8 @@ This package contains developer document
%patch8 -p1 -b .tooltip-positioning
%patch11 -p1 -b .remove-connecting-reason
#%patch14 -p1 -b .landscape-pdf-print
-%patch15 -p1 -b .filesystemref
%build
-
-# needed for Patch16, remove it when rebasing to 2.19.3
-gtkdocize || :
-libtoolize --force || :
-aclocal || :
-autoheader || :
-automake || :
-autoconf || :
%configure --with-xinput=xfree \
--enable-debug \
--disable-gtk-doc \
@@ -187,21 +177,12 @@ make %{?_smp_mflags}
# turn off for now, since floatingtest needs a display
#make check
-# create a dummy binary for /usr/lib/gtk-2.0/immodules to work around
-# problems in our ia64 multilib infrastructure
-# See https://bugzilla.redhat.com/show_bug.cgi?id=253726 for more details
-%if 0
-echo 'int main (void) { return 0; }' > relocation-tag.c
-gcc -Os relocation-tag.c -o relocation-tag
-%endif
-
# truncate NEWS
awk '/^Overview of Changes/ { seen+=1 }
{ if (seen < 2) print }
{ if (seen == 2) { print "For older news, see http://git.gnome.org/cgit/gtk+/plain/NEWS"; exit } }' NEWS > tmp; mv tmp NEWS
%install
-rm -rf $RPM_BUILD_ROOT
# Deriving /etc/gtk-2.0/$host location
# NOTE: Duplicated below
#
@@ -286,13 +267,6 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2
mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/immodules
mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{bin_version}/filesystems
-%if 0
-# we need to install a binary in the immodules directory to make sure
-# that it gets properly relocated to /emul for ia64 emulation of x86
-# See https://bugzilla.redhat.com/show_bug.cgi?id=253726
-install -m 0755 relocation-tag $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/immodules
-%endif
-
#
# We need the substitution of $host so we use an external
# file list
@@ -399,6 +373,11 @@ fi
%doc tmpdocs/examples
%changelog
+* Wed Mar 10 2010 Matthias Clasen <mclasen at redhat.com> - 2.19.7-1
+- Update to 2.19.7
+- Add a VCS tag
+- Minor packaging cleanups
+
* Tue Feb 23 2010 Matthias Clasen <mclasen at redhat.com> - 2.19.6-1
- Update to 2.19.6
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/sources,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- sources 23 Feb 2010 21:30:01 -0000 1.133
+++ sources 10 Mar 2010 05:33:59 -0000 1.134
@@ -1 +1 @@
-524021c965a0e1a4ebadd58c576926a5 gtk+-2.19.6.tar.bz2
+d28d3857bc9a668e928714d8413f8b70 gtk+-2.19.7.tar.bz2
More information about the scm-commits
mailing list