From 0efca501359ad9171d658cbc1009ea14ba4c3ef6 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:27:36 +0000 Subject: [PATCH 01/97] Setup of module libgnomecanvas --- .cvsignore | 0 Makefile | 6 ++++++ sources | 0 3 files changed, 6 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..de0356f --- /dev/null +++ b/Makefile @@ -0,0 +1,6 @@ +# Makefile for source rpm: libgnomecanvas +# $Id$ +NAME := libgnomecanvas +SPECFILE = $(firstword $(wildcard *.spec)) + +include ../common/Makefile.common diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 2959c7ea7582670e11c2822dd0f0837be4f37e0a Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:27:39 +0000 Subject: [PATCH 02/97] auto-import changelog data from libgnomecanvas-1.108.0.90-1.src.rpm Wed Jan 02 2002 Havoc Pennington - 1.108.0.90 cvs snap Mon Nov 26 2001 Havoc Pennington - cvs snap 1.105.0.90, gtk 1.3.11 Fri Oct 26 2001 Havoc Pennington - new cvs snap, rebuild for gtk 1.3.10, add libglade dep, fix libart dep Fri Oct 05 2001 Havoc Pennington - rebuild cvs snap for new glib/gtk Fri Sep 21 2001 Havoc Pennington - new cvs snap with upstream changes Thu Sep 13 2001 Havoc Pennington - Initial build. --- .cvsignore | 1 + libgnomecanvas.spec | 95 +++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 97 insertions(+) create mode 100644 libgnomecanvas.spec diff --git a/.cvsignore b/.cvsignore index e69de29..46a3a90 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +libgnomecanvas-1.108.0.90.tar.gz diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec new file mode 100644 index 0000000..9c4710f --- /dev/null +++ b/libgnomecanvas.spec @@ -0,0 +1,95 @@ +%define gtk2_version 1.3.12.90 +%define libart_lgpl_version 2.3.7.91 +%define libglade2_version 1.99.5.90 + +Summary: GnomeCanvas widget +Name: libgnomecanvas +Version: 1.108.0.90 +Release: 1 +URL: http://www.gnome.org/ +Source0: %{name}-%{version}.tar.gz +License: LGPL +Group: System Environment/Libraries +BuildRoot: %{_tmppath}/%{name}-root +Requires: gtk2 >= %{gtk2_version} +BuildRequires: gtk2-devel >= %{gtk2_version} +BuildRequires: libart_lgpl-devel >= %{libart_lgpl_version} +BuildRequires: libglade2-devel >= %{libglade2_version} + +%description + +The canvas widget allows you to create custom displays using stock items +such as circles, lines, text, and so on. It was originally a port of the +Tk canvas widget but has evolved quite a bit over time. + +%package devel +Summary: Libraries and headers for libgnomecanvas. +Group: Development/Libraries +Requires: %name = %{version} +Conflicts: gnome-libs-devel < 1.4.1.2 +Requires: gtk2-devel >= %{gtk2_version} +Requires: libart_lgpl-devel >= %{libart_lgpl_version} +Requires: libglade2-devel >= %{libglade2_version} + +%description devel + +The canvas widget allows you to create custom displays using stock items +such as circles, lines, text, and so on. It was originally a port of the +Tk canvas widget but has evolved quite a bit over time. + +%prep +%setup -q + +%build +%configure +make %{?_smp_mflags} + +%install +rm -rf %{buildroot} +make install DESTDIR=$RPM_BUILD_ROOT + +%find_lang %name + +%clean +rm -rf %{buildroot} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files -f %{name}.lang +%defattr(-,root,root) + +%doc AUTHORS COPYING ChangeLog NEWS README + +%{_libdir}/lib*.so.* + +%files devel +%defattr(-,root,root) + +%{_libdir}/lib*.a +%{_libdir}/lib*.so +%{_libdir}/pkgconfig/* +%{_includedir}/* + +%changelog +* Wed Jan 2 2002 Havoc Pennington +- 1.108.0.90 cvs snap + +* Mon Nov 26 2001 Havoc Pennington +- cvs snap 1.105.0.90, gtk 1.3.11 + +* Fri Oct 26 2001 Havoc Pennington +- new cvs snap, rebuild for gtk 1.3.10, + add libglade dep, fix libart dep + +* Fri Oct 5 2001 Havoc Pennington +- rebuild cvs snap for new glib/gtk + +* Fri Sep 21 2001 Havoc Pennington +- new cvs snap with upstream changes + +* Thu Sep 13 2001 Havoc Pennington +- Initial build. + + diff --git a/sources b/sources index e69de29..365aca1 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +518561843f0a6f57d1671de4f29a6c1e libgnomecanvas-1.108.0.90.tar.gz From 1e2fc070dbb5b12b91b9a9226922fda9c00c2dfd Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:27:41 +0000 Subject: [PATCH 03/97] auto-import changelog data from libgnomecanvas-1.117.0-2.src.rpm Fri May 17 2002 Havoc Pennington - rebuild in different environment Fri May 17 2002 Havoc Pennington - 1.117.0 Thu May 02 2002 Havoc Pennington - rebuild for new libglade - 1.116.0 Thu Apr 04 2002 Jeremy Katz - 1.114.0 Tue Feb 19 2002 Alex Larsson - Add nasty version check stuff. Thu Feb 14 2002 Havoc Pennington - 1.111.0 Wed Jan 30 2002 Owen Taylor - Version 1.110.0 Fri Jan 25 2002 Havoc Pennington - rebuild in rawhide --- .cvsignore | 2 +- libgnomecanvas.spec | 69 +++++++++++++++++++++++++++++++++++++++------ sources | 2 +- 3 files changed, 63 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index 46a3a90..bbce693 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgnomecanvas-1.108.0.90.tar.gz +libgnomecanvas-1.117.0.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 9c4710f..ac19e6b 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -1,13 +1,22 @@ -%define gtk2_version 1.3.12.90 -%define libart_lgpl_version 2.3.7.91 -%define libglade2_version 1.99.5.90 +%define gtk2_version 2.0 +%define libart_lgpl_version 2.3.8 +%define libglade2_version 1.99.12 + +###### This is all cut-and-paste boilerplate +%define version_stamp_dir %{_datadir}/rpm-versions/%{name} +%define version_stamp_file %{_datadir}/rpm-versions/%{name}/%{version}-%{release} +%define install_version_stamp mkdir -p $RPM_BUILD_ROOT/%{version_stamp_dir} && echo %{version}-%{release} > $RPM_BUILD_ROOT/%{version_stamp_file} +%define devel_version_stamp_dir %{_datadir}/rpm-versions/%{name}-devel +%define devel_version_stamp_file %{_datadir}/rpm-versions/%{name}-devel/%{version}-%{release} +%define install_devel_version_stamp mkdir -p $RPM_BUILD_ROOT/%{devel_version_stamp_dir} && echo %{version}-%{release} > $RPM_BUILD_ROOT/%{devel_version_stamp_file} +###### End cut-and-paste boilerplate Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 1.108.0.90 -Release: 1 +Version: 1.117.0 +Release: 2 URL: http://www.gnome.org/ -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.bz2 License: LGPL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-root @@ -25,8 +34,8 @@ Tk canvas widget but has evolved quite a bit over time. %package devel Summary: Libraries and headers for libgnomecanvas. Group: Development/Libraries -Requires: %name = %{version} -Conflicts: gnome-libs-devel < 1.4.1.2 +Requires: %name = %{version} +Conflicts: gnome-libs-devel < 1.4.1.2 Requires: gtk2-devel >= %{gtk2_version} Requires: libart_lgpl-devel >= %{libart_lgpl_version} Requires: libglade2-devel >= %{libglade2_version} @@ -41,6 +50,20 @@ Tk canvas widget but has evolved quite a bit over time. %setup -q %build + +## ensure that --nodeps doesn't mess things up (configure.in also +## checks this in theory, but in principle the RPM and configure.in +## could require different versions, and a double check is nice +## anyhow) +if ! pkg-config --atleast-version=%{gtk2_version} gtk+-2.0; then + echo "gtk-devel does not meet the build requirements" + exit 1 +fi +if ! pkg-config --atleast-version=%{libglade2_version} libglade-2.0; then + echo "libglade2-devel does not meet the build requirements" + exit 1 +fi + %configure make %{?_smp_mflags} @@ -48,6 +71,9 @@ make %{?_smp_mflags} rm -rf %{buildroot} make install DESTDIR=$RPM_BUILD_ROOT +%install_version_stamp +%install_devel_version_stamp + %find_lang %name %clean @@ -66,13 +92,40 @@ rm -rf %{buildroot} %files devel %defattr(-,root,root) +%{version_stamp_dir} %{_libdir}/lib*.a %{_libdir}/lib*.so %{_libdir}/pkgconfig/* %{_includedir}/* +%{devel_version_stamp_dir} %changelog +* Fri May 17 2002 Havoc Pennington +- rebuild in different environment + +* Fri May 17 2002 Havoc Pennington +- 1.117.0 + +* Thu May 2 2002 Havoc Pennington +- rebuild for new libglade +- 1.116.0 + +* Thu Apr 4 2002 Jeremy Katz +- 1.114.0 + +* Tue Feb 19 2002 Alex Larsson +- Add nasty version check stuff. + +* Thu Feb 14 2002 Havoc Pennington +- 1.111.0 + +* Wed Jan 30 2002 Owen Taylor +- Version 1.110.0 + +* Fri Jan 25 2002 Havoc Pennington +- rebuild in rawhide + * Wed Jan 2 2002 Havoc Pennington - 1.108.0.90 cvs snap diff --git a/sources b/sources index 365aca1..4d01b5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -518561843f0a6f57d1671de4f29a6c1e libgnomecanvas-1.108.0.90.tar.gz +e294e835dd6e6ed48466ae40f39a0d8b libgnomecanvas-1.117.0.tar.bz2 From 249991beb96edbea6a959989226953df72db89eb Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:27:49 +0000 Subject: [PATCH 04/97] auto-import changelog data from libgnomecanvas-2.0.1-3.src.rpm Fri Jul 12 2002 Havoc Pennington - fix gettext package name Mon Jun 17 2002 Havoc Pennington - remove empty AUTHORS/README Sat Jun 15 2002 Havoc Pennington - 2.0.1 - check file list, add glade module and gtk-doc docs Sun May 26 2002 Tim Powers - automated rebuild --- .cvsignore | 2 +- libgnomecanvas.spec | 67 ++++++++++++++++++++++----------------------- sources | 2 +- 3 files changed, 35 insertions(+), 36 deletions(-) diff --git a/.cvsignore b/.cvsignore index bbce693..8d9ede8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgnomecanvas-1.117.0.tar.bz2 +libgnomecanvas-2.0.1.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index ac19e6b..ff31d6c 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -1,20 +1,14 @@ -%define gtk2_version 2.0 -%define libart_lgpl_version 2.3.8 -%define libglade2_version 1.99.12 -###### This is all cut-and-paste boilerplate -%define version_stamp_dir %{_datadir}/rpm-versions/%{name} -%define version_stamp_file %{_datadir}/rpm-versions/%{name}/%{version}-%{release} -%define install_version_stamp mkdir -p $RPM_BUILD_ROOT/%{version_stamp_dir} && echo %{version}-%{release} > $RPM_BUILD_ROOT/%{version_stamp_file} -%define devel_version_stamp_dir %{_datadir}/rpm-versions/%{name}-devel -%define devel_version_stamp_file %{_datadir}/rpm-versions/%{name}-devel/%{version}-%{release} -%define install_devel_version_stamp mkdir -p $RPM_BUILD_ROOT/%{devel_version_stamp_dir} && echo %{version}-%{release} > $RPM_BUILD_ROOT/%{devel_version_stamp_file} -###### End cut-and-paste boilerplate +%define gettext_package libgnomecanvas-2.0 + +%define gtk2_version 2.0.0 +%define libart_lgpl_version 2.3.8 +%define libglade2_version 2.0.0 Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 1.117.0 -Release: 2 +Version: 2.0.1 +Release: 3 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -51,19 +45,6 @@ Tk canvas widget but has evolved quite a bit over time. %build -## ensure that --nodeps doesn't mess things up (configure.in also -## checks this in theory, but in principle the RPM and configure.in -## could require different versions, and a double check is nice -## anyhow) -if ! pkg-config --atleast-version=%{gtk2_version} gtk+-2.0; then - echo "gtk-devel does not meet the build requirements" - exit 1 -fi -if ! pkg-config --atleast-version=%{libglade2_version} libglade-2.0; then - echo "libglade2-devel does not meet the build requirements" - exit 1 -fi - %configure make %{?_smp_mflags} @@ -71,10 +52,7 @@ make %{?_smp_mflags} rm -rf %{buildroot} make install DESTDIR=$RPM_BUILD_ROOT -%install_version_stamp -%install_devel_version_stamp - -%find_lang %name +%find_lang %{gettext_package} %clean rm -rf %{buildroot} @@ -83,24 +61,45 @@ rm -rf %{buildroot} %postun -p /sbin/ldconfig -%files -f %{name}.lang +%files -f %{gettext_package}.lang %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README +%doc COPYING ChangeLog NEWS %{_libdir}/lib*.so.* +# avoid the .a file, get .la against better judgment +%dir %{_libdir}/libglade +%dir %{_libdir}/libglade/2.0 +%{_libdir}/libglade/2.0/libcanvas.so +%{_libdir}/libglade/2.0/libcanvas.la + %files devel %defattr(-,root,root) -%{version_stamp_dir} %{_libdir}/lib*.a %{_libdir}/lib*.so %{_libdir}/pkgconfig/* %{_includedir}/* -%{devel_version_stamp_dir} +%{_datadir}/gtk-doc %changelog +* Fri Jul 12 2002 Havoc Pennington +- fix gettext package name + +* Mon Jun 17 2002 Havoc Pennington +- remove empty AUTHORS/README + +* Sat Jun 15 2002 Havoc Pennington +- 2.0.1 +- check file list, add glade module and gtk-doc docs + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Fri May 17 2002 Havoc Pennington +- rebuild in different environment + * Fri May 17 2002 Havoc Pennington - rebuild in different environment diff --git a/sources b/sources index 4d01b5d..76998bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e294e835dd6e6ed48466ae40f39a0d8b libgnomecanvas-1.117.0.tar.bz2 +93501769aa47cfe5b2a27fa087d1c86e libgnomecanvas-2.0.1.tar.bz2 From 0708d5224b49dfc45ca93459094596c3d791d9f9 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:27:53 +0000 Subject: [PATCH 05/97] auto-import changelog data from libgnomecanvas-2.0.2-1.src.rpm Mon Aug 12 2002 Havoc Pennington - 2.0.2 --- .cvsignore | 2 +- libgnomecanvas.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8d9ede8..4ef5a37 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgnomecanvas-2.0.1.tar.bz2 +libgnomecanvas-2.0.2.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index ff31d6c..0a1d0c5 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,8 +7,8 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.0.1 -Release: 3 +Version: 2.0.2 +Release: 1 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -52,6 +52,9 @@ make %{?_smp_mflags} rm -rf %{buildroot} make install DESTDIR=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/libglade/2.0/*.a + %find_lang %{gettext_package} %clean @@ -84,6 +87,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Mon Aug 12 2002 Havoc Pennington +- 2.0.2 + * Fri Jul 12 2002 Havoc Pennington - fix gettext package name diff --git a/sources b/sources index 76998bb..83d6d6b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -93501769aa47cfe5b2a27fa087d1c86e libgnomecanvas-2.0.1.tar.bz2 +88fda0ee5b1090ba4da1d82a433d2ddb libgnomecanvas-2.0.2.tar.bz2 From d8110d3446a6240b624483f08fdc9f2a98c2444d Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:28:01 +0000 Subject: [PATCH 06/97] auto-import changelog data from libgnomecanvas-2.2.0.1-1.src.rpm Thu Jan 23 2003 Alexander Larsson 2.2.0.1-1 - Update to 2.2.0.1 Wed Jan 22 2003 Tim Powers - rebuilt Thu Jan 16 2003 Alexander Larsson 2.1.90-2 - Run libtoolize to make package rebuilding possible without the package already installed (#78045) Thu Jan 09 2003 Alexander Larsson - Update to 2.1.90 Fri Nov 08 2002 Havoc Pennington - 2.1.0 --- .cvsignore | 2 +- libgnomecanvas.spec | 26 +++++++++++++++++++++----- sources | 2 +- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4ef5a37..caf6600 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgnomecanvas-2.0.2.tar.bz2 +libgnomecanvas-2.2.0.1.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 0a1d0c5..aac5a71 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -1,13 +1,13 @@ %define gettext_package libgnomecanvas-2.0 -%define gtk2_version 2.0.0 +%define gtk2_version 2.1.2 %define libart_lgpl_version 2.3.8 -%define libglade2_version 2.0.0 +%define libglade2_version 2.0.1 Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.0.2 +Version: 2.2.0.1 Release: 1 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 @@ -18,7 +18,7 @@ Requires: gtk2 >= %{gtk2_version} BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: libart_lgpl-devel >= %{libart_lgpl_version} BuildRequires: libglade2-devel >= %{libglade2_version} - +BuildRequires: libtool %description The canvas widget allows you to create custom displays using stock items @@ -44,7 +44,8 @@ Tk canvas widget but has evolved quite a bit over time. %setup -q %build - +#replace shipped libtool files (bug #78045) +libtoolize -f %configure make %{?_smp_mflags} @@ -87,6 +88,21 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Thu Jan 23 2003 Alexander Larsson 2.2.0.1-1 +- Update to 2.2.0.1 + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Jan 16 2003 Alexander Larsson 2.1.90-2 +- Run libtoolize to make package rebuilding possible without the package already installed (#78045) + +* Thu Jan 9 2003 Alexander Larsson +- Update to 2.1.90 + +* Fri Nov 8 2002 Havoc Pennington +- 2.1.0 + * Mon Aug 12 2002 Havoc Pennington - 2.0.2 diff --git a/sources b/sources index 83d6d6b..6bdb632 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -88fda0ee5b1090ba4da1d82a433d2ddb libgnomecanvas-2.0.2.tar.bz2 +c7164feb78aee8c2c9c706fee1289963 libgnomecanvas-2.2.0.1.tar.bz2 From 6ed073d389e5788611b3b3a7f002f11c2592f1a2 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:28:10 +0000 Subject: [PATCH 07/97] auto-import changelog data from libgnomecanvas-2.2.0.1-2.src.rpm Tue Apr 08 2003 Jeremy Katz 2.2.0.1-2 - make LIBTOOL=/usr/bin/libtool (#88337) --- libgnomecanvas.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index aac5a71..8261f3e 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -8,7 +8,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.2.0.1 -Release: 1 +Release: 2 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -47,11 +47,11 @@ Tk canvas widget but has evolved quite a bit over time. #replace shipped libtool files (bug #78045) libtoolize -f %configure -make %{?_smp_mflags} +make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool %install rm -rf %{buildroot} -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/libglade/2.0/*.a @@ -88,6 +88,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Tue Apr 8 2003 Jeremy Katz 2.2.0.1-2 +- make LIBTOOL=/usr/bin/libtool (#88337) + * Thu Jan 23 2003 Alexander Larsson 2.2.0.1-1 - Update to 2.2.0.1 From 93e888e8e276b4e57dfc12962d96c10ef6d20462 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:28:44 +0000 Subject: [PATCH 08/97] auto-import changelog data from libgnomecanvas-2.4.0-1.src.rpm Wed Sep 03 2003 Alexander Larsson 2.4.0-1 - 2.4.0 Tue Aug 12 2003 Alexander Larsson 2.3.6-1 - gnome 2.3 update Wed Aug 06 2003 Elliot Lee - Fix libtool Thu Jun 05 2003 Elliot Lee - rebuilt Thu Jun 05 2003 Jeremy Katz 2.2.0.2-2 - rebuild --- .cvsignore | 2 +- libgnomecanvas.spec | 30 ++++++++++++++++++++++++------ sources | 2 +- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index caf6600..f7c5965 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgnomecanvas-2.2.0.1.tar.bz2 +libgnomecanvas-2.4.0.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 8261f3e..7e0ae59 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,8 +7,8 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.2.0.1 -Release: 2 +Version: 2.4.0 +Release: 1 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -46,12 +46,14 @@ Tk canvas widget but has evolved quite a bit over time. %build #replace shipped libtool files (bug #78045) libtoolize -f -%configure +%configure --disable-gtk-doc +export tagname=CC make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool %install rm -rf %{buildroot} -make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool +export tagname=CC +make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/libglade/2.0/*.a @@ -88,8 +90,24 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog -* Tue Apr 8 2003 Jeremy Katz 2.2.0.1-2 -- make LIBTOOL=/usr/bin/libtool (#88337) +* Wed Sep 3 2003 Alexander Larsson 2.4.0-1 +- 2.4.0 + +* Tue Aug 12 2003 Alexander Larsson 2.3.6-1 +- gnome 2.3 update + +* Wed Aug 6 2003 Elliot Lee +- Fix libtool + +* Wed Jun 5 2003 Elliot Lee +- rebuilt + +* Thu Jun 5 2003 Jeremy Katz 2.2.0.2-2 +- rebuild + +* Tue Apr 8 2003 Jeremy Katz 2.2.0.2-1 +- update to 2.2.0.2 +- use system libtool * Thu Jan 23 2003 Alexander Larsson 2.2.0.1-1 - Update to 2.2.0.1 diff --git a/sources b/sources index 6bdb632..e024d2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c7164feb78aee8c2c9c706fee1289963 libgnomecanvas-2.2.0.1.tar.bz2 +c212a7cac06b7f9e68ed2de38df6e54d libgnomecanvas-2.4.0.tar.bz2 From 62cee12d016e6db5a28aa04fe6c1d3a866c09f9e Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:28:49 +0000 Subject: [PATCH 09/97] auto-import changelog data from libgnomecanvas-2.5.3-1.src.rpm Tue Jan 20 2004 Alexander Larsson 2.5.3-1 - 2.5.3 --- .cvsignore | 2 +- libgnomecanvas.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index f7c5965..02cd137 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgnomecanvas-2.4.0.tar.bz2 +libgnomecanvas-2.5.3.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 7e0ae59..12160fc 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,7 +7,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.4.0 +Version: 2.5.3 Release: 1 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 @@ -90,6 +90,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Tue Jan 20 2004 Alexander Larsson 2.5.3-1 +- 2.5.3 + * Wed Sep 3 2003 Alexander Larsson 2.4.0-1 - 2.4.0 diff --git a/sources b/sources index e024d2d..19b91be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c212a7cac06b7f9e68ed2de38df6e54d libgnomecanvas-2.4.0.tar.bz2 +b087ae759a7ee9e691f6a693a71abfc5 libgnomecanvas-2.5.3.tar.bz2 From ee52712f41bc52ab998927358adef70d756fa294 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:29:04 +0000 Subject: [PATCH 10/97] auto-import changelog data from libgnomecanvas-2.5.91-2.src.rpm Thu Mar 11 2004 Alex Larsson 2.5.91-2 - enable gtk-doc Wed Mar 10 2004 Alexander Larsson 2.5.91-1 - update to 2.5.91 Tue Mar 02 2004 Elliot Lee - rebuilt Wed Feb 25 2004 Alexander Larsson 2.5.90-1 - 2.5.90 Fri Feb 13 2004 Elliot Lee - rebuilt --- .cvsignore | 2 +- libgnomecanvas.spec | 26 +++++++++++++++++++++++--- sources | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 02cd137..a8df6f5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgnomecanvas-2.5.3.tar.bz2 +libgnomecanvas-2.5.91.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 12160fc..f5c58d8 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,8 +7,8 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.5.3 -Release: 1 +Version: 2.5.91 +Release: 2 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -19,6 +19,10 @@ BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: libart_lgpl-devel >= %{libart_lgpl_version} BuildRequires: libglade2-devel >= %{libglade2_version} BuildRequires: libtool +BuildRequires: gtk-doc + +Patch1: libgnomecanvas-2.5.91-gtk-doc.patch + %description The canvas widget allows you to create custom displays using stock items @@ -42,11 +46,12 @@ Tk canvas widget but has evolved quite a bit over time. %prep %setup -q +%patch1 -p1 -b .gtk-doc %build #replace shipped libtool files (bug #78045) libtoolize -f -%configure --disable-gtk-doc +%configure --enable-gtk-doc export tagname=CC make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool @@ -90,6 +95,21 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Thu Mar 11 2004 Alex Larsson 2.5.91-2 +- enable gtk-doc + +* Wed Mar 10 2004 Alexander Larsson 2.5.91-1 +- update to 2.5.91 + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Wed Feb 25 2004 Alexander Larsson 2.5.90-1 +- 2.5.90 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + * Tue Jan 20 2004 Alexander Larsson 2.5.3-1 - 2.5.3 diff --git a/sources b/sources index 19b91be..b792f87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b087ae759a7ee9e691f6a693a71abfc5 libgnomecanvas-2.5.3.tar.bz2 +837c25ccd5f0ed2201a470fc1ab18beb libgnomecanvas-2.5.91.tar.bz2 From c2addad95f22dc3e28da38598dd8f55e488db87c Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:29:45 +0000 Subject: [PATCH 11/97] auto-import changelog data from libgnomecanvas-2.6.0-1.src.rpm Thu Apr 01 2004 Alex Larsson 2.6.0-1 - update to 2.6.0 --- .cvsignore | 2 +- libgnomecanvas.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index a8df6f5..ec48de6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgnomecanvas-2.5.91.tar.bz2 +libgnomecanvas-2.6.0.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index f5c58d8..c554112 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,8 +7,8 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.5.91 -Release: 2 +Version: 2.6.0 +Release: 1 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -95,6 +95,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Thu Apr 1 2004 Alex Larsson 2.6.0-1 +- update to 2.6.0 + * Thu Mar 11 2004 Alex Larsson 2.5.91-2 - enable gtk-doc diff --git a/sources b/sources index b792f87..f614a4a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -837c25ccd5f0ed2201a470fc1ab18beb libgnomecanvas-2.5.91.tar.bz2 +a670348ceecaa85b35940dcbd9f8c20e libgnomecanvas-2.6.0.tar.bz2 From 49ce097b4e52dacc4a2de04e7f846a8ef2d1f212 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:30:24 +0000 Subject: [PATCH 12/97] auto-import changelog data from libgnomecanvas-2.6.1.1-1.src.rpm Thu May 20 2004 Matthias Clasen 2.6.1.1-1 - update to 2.6.1.1 --- .cvsignore | 2 +- libgnomecanvas.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index ec48de6..6965cac 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgnomecanvas-2.6.0.tar.bz2 +libgnomecanvas-2.6.1.1.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index c554112..4c38078 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,7 +7,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.6.0 +Version: 2.6.1.1 Release: 1 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 @@ -21,6 +21,7 @@ BuildRequires: libglade2-devel >= %{libglade2_version} BuildRequires: libtool BuildRequires: gtk-doc +# can be removed for 2.6.2 Patch1: libgnomecanvas-2.5.91-gtk-doc.patch %description @@ -95,6 +96,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Thu May 20 2004 Matthias Clasen 2.6.1.1-1 +- update to 2.6.1.1 + * Thu Apr 1 2004 Alex Larsson 2.6.0-1 - update to 2.6.0 diff --git a/sources b/sources index f614a4a..59a64e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a670348ceecaa85b35940dcbd9f8c20e libgnomecanvas-2.6.0.tar.bz2 +040257b0231fd5fc507f731d73d9738b libgnomecanvas-2.6.1.1.tar.bz2 From 49cdbf4d6e29dc136f60102e87a0a33eb1d472f8 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:30:27 +0000 Subject: [PATCH 13/97] auto-import changelog data from libgnomecanvas-2.6.1.1-2.src.rpm Tue Jun 15 2004 Elliot Lee - rebuilt --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 4c38078..3c78a51 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -8,7 +8,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.6.1.1 -Release: 1 +Release: 2 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -96,6 +96,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + * Thu May 20 2004 Matthias Clasen 2.6.1.1-1 - update to 2.6.1.1 From 5bfc67fd860306969b877a96e5add191fabb3b70 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:30:30 +0000 Subject: [PATCH 14/97] auto-import changelog data from libgnomecanvas-2.7.1-1.src.rpm Fri Jul 30 2004 Matthias Clasen 2.7.1-1 - update to 2.7.1 - drop the gtk-doc patch --- .cvsignore | 2 +- libgnomecanvas.spec | 15 ++++++++------- sources | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6965cac..a6be24f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgnomecanvas-2.6.1.1.tar.bz2 +libgnomecanvas-2.7.1.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 3c78a51..03d9e4a 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,8 +7,8 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.6.1.1 -Release: 2 +Version: 2.7.1 +Release: 1 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -21,9 +21,6 @@ BuildRequires: libglade2-devel >= %{libglade2_version} BuildRequires: libtool BuildRequires: gtk-doc -# can be removed for 2.6.2 -Patch1: libgnomecanvas-2.5.91-gtk-doc.patch - %description The canvas widget allows you to create custom displays using stock items @@ -47,7 +44,6 @@ Tk canvas widget but has evolved quite a bit over time. %prep %setup -q -%patch1 -p1 -b .gtk-doc %build #replace shipped libtool files (bug #78045) @@ -96,6 +92,10 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Fri Jul 30 2004 Matthias Clasen 2.7.1-1 +- update to 2.7.1 +- drop the gtk-doc patch + * Tue Jun 15 2004 Elliot Lee - rebuilt @@ -149,7 +149,8 @@ rm -rf %{buildroot} - rebuilt * Thu Jan 16 2003 Alexander Larsson 2.1.90-2 -- Run libtoolize to make package rebuilding possible without the package already installed (#78045) +- Run libtoolize to make package rebuilding possible + without the package already installed (#78045) * Thu Jan 9 2003 Alexander Larsson - Update to 2.1.90 diff --git a/sources b/sources index 59a64e7..7bcfd28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -040257b0231fd5fc507f731d73d9738b libgnomecanvas-2.6.1.1.tar.bz2 +d539db806b9516134366b66a8f8d7654 libgnomecanvas-2.7.1.tar.bz2 From c807c813273dd8f0a7ba4e280e0b6854caa2c3fa Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:30:34 +0000 Subject: [PATCH 15/97] auto-import changelog data from libgnomecanvas-2.7.92-1.src.rpm Tue Aug 31 2004 Alex Larsson 2.7.92-1 - update to 2.7.92 --- .cvsignore | 2 +- libgnomecanvas.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index a6be24f..7015dc6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgnomecanvas-2.7.1.tar.bz2 +libgnomecanvas-2.7.92.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 03d9e4a..a1c7543 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,7 +7,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.7.1 +Version: 2.7.92 Release: 1 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 @@ -72,7 +72,7 @@ rm -rf %{buildroot} %files -f %{gettext_package}.lang %defattr(-,root,root) -%doc COPYING ChangeLog NEWS +%doc COPYING.LIB ChangeLog NEWS %{_libdir}/lib*.so.* @@ -92,6 +92,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Tue Aug 31 2004 Alex Larsson 2.7.92-1 +- update to 2.7.92 + * Fri Jul 30 2004 Matthias Clasen 2.7.1-1 - update to 2.7.1 - drop the gtk-doc patch diff --git a/sources b/sources index 7bcfd28..3029a75 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d539db806b9516134366b66a8f8d7654 libgnomecanvas-2.7.1.tar.bz2 +e46b28b20209ec58f1f5a01493b531c9 libgnomecanvas-2.7.92.tar.bz2 From ebb2d670455da271e69d56d4df68c0c30de7003c Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Wed, 22 Sep 2004 15:13:10 +0000 Subject: [PATCH 16/97] - update to 2.8.0 --- .cvsignore | 1 + libgnomecanvas.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7015dc6..f215007 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ libgnomecanvas-2.7.92.tar.bz2 +libgnomecanvas-2.8.0.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index a1c7543..14471c4 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,7 +7,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.7.92 +Version: 2.8.0 Release: 1 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 @@ -92,6 +92,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Wed Sep 22 2004 Alexander Larsson - 2.8.0-1 +- update to 2.8.0 + * Tue Aug 31 2004 Alex Larsson 2.7.92-1 - update to 2.7.92 diff --git a/sources b/sources index 3029a75..af38296 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e46b28b20209ec58f1f5a01493b531c9 libgnomecanvas-2.7.92.tar.bz2 +2bf10396a92777e7b64b6052a8a232f1 libgnomecanvas-2.8.0.tar.bz2 From 57e292cfb0e50e30944bb96f9b1159e4ea56b1a9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 26 Jan 2005 17:18:21 +0000 Subject: [PATCH 17/97] update to 2.9.1 --- .cvsignore | 1 + libgnomecanvas.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index f215007..e0ea4ff 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ libgnomecanvas-2.7.92.tar.bz2 libgnomecanvas-2.8.0.tar.bz2 +libgnomecanvas-2.9.1.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 14471c4..6863d47 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,7 +7,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.8.0 +Version: 2.9.1 Release: 1 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 @@ -92,6 +92,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Wed Jan 26 2005 Matthias Clasen - 2.9.0-1 +- update to 2.9.1 + * Wed Sep 22 2004 Alexander Larsson - 2.8.0-1 - update to 2.8.0 diff --git a/sources b/sources index af38296..5e143a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2bf10396a92777e7b64b6052a8a232f1 libgnomecanvas-2.8.0.tar.bz2 +c0f30d7d1cc03d261ff2c9b1f9bb3ef9 libgnomecanvas-2.9.1.tar.bz2 From 7b88964e4b2e752eefb12205baea852273940928 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 2 Mar 2005 16:58:45 +0000 Subject: [PATCH 18/97] Update to 2.9.2 --- .cvsignore | 1 + libgnomecanvas.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index e0ea4ff..2a77844 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ libgnomecanvas-2.7.92.tar.bz2 libgnomecanvas-2.8.0.tar.bz2 libgnomecanvas-2.9.1.tar.bz2 +libgnomecanvas-2.9.2.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 6863d47..662c634 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,7 +7,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.9.1 +Version: 2.9.2 Release: 1 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 @@ -92,7 +92,10 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog -* Wed Jan 26 2005 Matthias Clasen - 2.9.0-1 +* Wed Mar 2 2005 Matthias Clasen - 2.9.2-1 +- update to 2.9.2 + +* Wed Jan 26 2005 Matthias Clasen - 2.9.1-1 - update to 2.9.1 * Wed Sep 22 2004 Alexander Larsson - 2.8.0-1 diff --git a/sources b/sources index 5e143a1..3ea3b23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c0f30d7d1cc03d261ff2c9b1f9bb3ef9 libgnomecanvas-2.9.1.tar.bz2 +5dc4d3ba2190faec4cde94ec9131d6f1 libgnomecanvas-2.9.2.tar.bz2 From c81917c1491cc17cf8c8c716a0e999ecc325f160 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 14 Mar 2005 16:57:13 +0000 Subject: [PATCH 19/97] Update to 2.10.0 --- .cvsignore | 1 + libgnomecanvas.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2a77844..184850c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ libgnomecanvas-2.7.92.tar.bz2 libgnomecanvas-2.8.0.tar.bz2 libgnomecanvas-2.9.1.tar.bz2 libgnomecanvas-2.9.2.tar.bz2 +libgnomecanvas-2.10.0.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 662c634..731bbba 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,7 +7,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.9.2 +Version: 2.10.0 Release: 1 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 @@ -92,6 +92,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Mon Mar 14 2005 Matthias Clasen - 2.10.0-1 +- update to 2.10.0 + * Wed Mar 2 2005 Matthias Clasen - 2.9.2-1 - update to 2.9.2 diff --git a/sources b/sources index 3ea3b23..422100c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5dc4d3ba2190faec4cde94ec9131d6f1 libgnomecanvas-2.9.2.tar.bz2 +88aac06c8dfd24671db3fe3bf881b5fc libgnomecanvas-2.10.0.tar.bz2 From 3f12126a3e3de285527a8b741e00f8e369407ca4 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 28 Jun 2005 17:04:05 +0000 Subject: [PATCH 20/97] Update to 2.11.1 --- .cvsignore | 1 + libgnomecanvas.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 184850c..3ec668b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -3,3 +3,4 @@ libgnomecanvas-2.8.0.tar.bz2 libgnomecanvas-2.9.1.tar.bz2 libgnomecanvas-2.9.2.tar.bz2 libgnomecanvas-2.10.0.tar.bz2 +libgnomecanvas-2.11.1.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 731bbba..818e261 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,7 +7,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.10.0 +Version: 2.11.1 Release: 1 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 @@ -92,6 +92,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Tue Jun 28 2005 Matthias Clasen - 2.11.1-1 +- Update to 2.11.1 + * Mon Mar 14 2005 Matthias Clasen - 2.10.0-1 - update to 2.10.0 diff --git a/sources b/sources index 422100c..4e3d936 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -88aac06c8dfd24671db3fe3bf881b5fc libgnomecanvas-2.10.0.tar.bz2 +06d900efedb6f3ea011b43053dab3c0b libgnomecanvas-2.11.1.tar.bz2 From 1866a10d6a730160058a44177a53b889a435abdf Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 16 Aug 2005 12:45:35 +0000 Subject: [PATCH 21/97] Rebuild --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 818e261..ab9920d 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -8,7 +8,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.11.1 -Release: 1 +Release: 2 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -92,6 +92,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Tue Aug 16 2005 Matthias Clasen +- Rebuilt + * Tue Jun 28 2005 Matthias Clasen - 2.11.1-1 - Update to 2.11.1 From 9b845c075db6c8300ad75fddc3f9cc6d7f96752b Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Wed, 17 Aug 2005 07:28:38 +0000 Subject: [PATCH 22/97] rebuild for new cairo --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index ab9920d..6e27822 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -8,7 +8,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.11.1 -Release: 2 +Release: 3 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -92,6 +92,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Tue Aug 16 2005 Warren Togami - 2.11.1-3 +- rebuild for new cairo + * Tue Aug 16 2005 Matthias Clasen - Rebuilt From 7c9df1f4610333cb086d094becb07127d2e0d320 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 7 Sep 2005 17:28:12 +0000 Subject: [PATCH 23/97] 2.12.0 --- .cvsignore | 1 + libgnomecanvas.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3ec668b..a33dece 100644 --- a/.cvsignore +++ b/.cvsignore @@ -4,3 +4,4 @@ libgnomecanvas-2.9.1.tar.bz2 libgnomecanvas-2.9.2.tar.bz2 libgnomecanvas-2.10.0.tar.bz2 libgnomecanvas-2.11.1.tar.bz2 +libgnomecanvas-2.12.0.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 6e27822..502a942 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,8 +7,8 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.11.1 -Release: 3 +Version: 2.12.0 +Release: 1 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -92,6 +92,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Wed Sep 7 2005 Matthias Clasen - 2.12.0-1 +- update to 2.12.0 + * Tue Aug 16 2005 Warren Togami - 2.11.1-3 - rebuild for new cairo diff --git a/sources b/sources index 4e3d936..3cad3cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -06d900efedb6f3ea011b43053dab3c0b libgnomecanvas-2.11.1.tar.bz2 +62c0edd3d27803d341662fd9088b2d9b libgnomecanvas-2.12.0.tar.bz2 From 0947225ed646f478ba520f5665b31f2af0923b3a Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 9 Dec 2005 22:41:34 +0000 Subject: [PATCH 24/97] gcc update bump --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 502a942..d1a7d95 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -8,7 +8,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.12.0 -Release: 1 +Release: 1.1 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -92,6 +92,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Fri Dec 09 2005 Jesse Keating +- rebuilt + * Wed Sep 7 2005 Matthias Clasen - 2.12.0-1 - update to 2.12.0 From 7620b28db706e3d1b8f53e6ebca2cff6d673fa28 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Tue, 13 Dec 2005 21:30:10 +0000 Subject: [PATCH 25/97] - rebuild with -O1 to workaround (#175669) --- libgnomecanvas.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index d1a7d95..10d9536 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -8,7 +8,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.12.0 -Release: 1.1 +Release: 1.2 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -48,6 +48,7 @@ Tk canvas widget but has evolved quite a bit over time. %build #replace shipped libtool files (bug #78045) libtoolize -f +export CFLAGS=$(echo $RPM_OPT_FLAGS |sed -e 's/O2/O1/g') %configure --enable-gtk-doc export tagname=CC make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool @@ -92,6 +93,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Tue Dec 13 2005 Jeremy Katz - 2.12.0-1.2 +- rebuild with -O1 to workaround (#175669) + * Fri Dec 09 2005 Jesse Keating - rebuilt From c51884fd245ca6f17364f43597725c295803d2ab Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 3 Jan 2006 17:04:36 +0000 Subject: [PATCH 26/97] 2.13.0 --- .cvsignore | 1 + libgnomecanvas.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index a33dece..701c5dd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -5,3 +5,4 @@ libgnomecanvas-2.9.2.tar.bz2 libgnomecanvas-2.10.0.tar.bz2 libgnomecanvas-2.11.1.tar.bz2 libgnomecanvas-2.12.0.tar.bz2 +libgnomecanvas-2.13.0.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 10d9536..3e30a5f 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,8 +7,8 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.12.0 -Release: 1.2 +Version: 2.13.0 +Release: 1 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -93,6 +93,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Tue Jan 03 2006 Matthias Clasen - 2.13.0-1 +- Update to 2.13.0 + * Tue Dec 13 2005 Jeremy Katz - 2.12.0-1.2 - rebuild with -O1 to workaround (#175669) diff --git a/sources b/sources index 3cad3cf..243ab0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -62c0edd3d27803d341662fd9088b2d9b libgnomecanvas-2.12.0.tar.bz2 +3c0201810e916b97ba3533b13f3fc4e8 libgnomecanvas-2.13.0.tar.bz2 From 75c65c22950a7febc30017fa423ecb6ae8843259 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 7 Feb 2006 12:38:13 +0000 Subject: [PATCH 27/97] bump for new gcc/glibc --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 3e30a5f..b7ad651 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -8,7 +8,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.13.0 -Release: 1 +Release: 1.1 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -93,6 +93,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Tue Feb 07 2006 Jesse Keating - 2.13.0-1.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + * Tue Jan 03 2006 Matthias Clasen - 2.13.0-1 - Update to 2.13.0 From c2b277d5cc085456a254ea04b314f736b6e0626e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 11 Feb 2006 03:57:48 +0000 Subject: [PATCH 28/97] bump for bug in double-long on ppc(64) --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index b7ad651..13ddf76 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -8,7 +8,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.13.0 -Release: 1.1 +Release: 1.2 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -93,6 +93,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Fri Feb 10 2006 Jesse Keating - 2.13.0-1.2 +- bump again for double-long bug on ppc(64) + * Tue Feb 07 2006 Jesse Keating - 2.13.0-1.1 - rebuilt for new gcc4.1 snapshot and glibc changes From 18db4e6294ca8203902c6975431302ee1a87426e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 13 Mar 2006 14:37:14 +0000 Subject: [PATCH 29/97] 2.14.0 --- .cvsignore | 1 + libgnomecanvas.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 701c5dd..2832a90 100644 --- a/.cvsignore +++ b/.cvsignore @@ -6,3 +6,4 @@ libgnomecanvas-2.10.0.tar.bz2 libgnomecanvas-2.11.1.tar.bz2 libgnomecanvas-2.12.0.tar.bz2 libgnomecanvas-2.13.0.tar.bz2 +libgnomecanvas-2.14.0.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 13ddf76..862208b 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,8 +7,8 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.13.0 -Release: 1.2 +Version: 2.14.0 +Release: 1 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -93,6 +93,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Mon Mar 13 2006 Matthias Clasen - 2.14.0-1 +- Update to 2.14.0 + * Fri Feb 10 2006 Jesse Keating - 2.13.0-1.2 - bump again for double-long bug on ppc(64) diff --git a/sources b/sources index 243ab0a..7016536 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3c0201810e916b97ba3533b13f3fc4e8 libgnomecanvas-2.13.0.tar.bz2 +516c46fb4a1401b05cfef58c350fbd3d libgnomecanvas-2.14.0.tar.bz2 From 84cc817cc631196f7a378e73f9062ff622fc7a85 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 23 May 2006 18:32:13 +0000 Subject: [PATCH 30/97] multilib --- libgnomecanvas.spec | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 862208b..1c604ef 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -8,7 +8,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.14.0 -Release: 1 +Release: 2 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -19,16 +19,14 @@ BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: libart_lgpl-devel >= %{libart_lgpl_version} BuildRequires: libglade2-devel >= %{libglade2_version} BuildRequires: libtool -BuildRequires: gtk-doc %description - The canvas widget allows you to create custom displays using stock items such as circles, lines, text, and so on. It was originally a port of the Tk canvas widget but has evolved quite a bit over time. %package devel -Summary: Libraries and headers for libgnomecanvas. +Summary: Libraries and headers for libgnomecanvas Group: Development/Libraries Requires: %name = %{version} Conflicts: gnome-libs-devel < 1.4.1.2 @@ -46,10 +44,8 @@ Tk canvas widget but has evolved quite a bit over time. %setup -q %build -#replace shipped libtool files (bug #78045) -libtoolize -f export CFLAGS=$(echo $RPM_OPT_FLAGS |sed -e 's/O2/O1/g') -%configure --enable-gtk-doc +%configure --disable-gtk-doc export tagname=CC make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool @@ -77,22 +73,24 @@ rm -rf %{buildroot} %{_libdir}/lib*.so.* -# avoid the .a file, get .la against better judgment %dir %{_libdir}/libglade %dir %{_libdir}/libglade/2.0 %{_libdir}/libglade/2.0/libcanvas.so -%{_libdir}/libglade/2.0/libcanvas.la %files devel %defattr(-,root,root) -%{_libdir}/lib*.a %{_libdir}/lib*.so %{_libdir}/pkgconfig/* %{_includedir}/* %{_datadir}/gtk-doc %changelog +* Tue May 23 2006 Matthias Clasen - 2.14.0-2 +- Fix multilib conflicts +- Don't ship .la files +- Some spec file cleanups + * Mon Mar 13 2006 Matthias Clasen - 2.14.0-1 - Update to 2.14.0 From 50783a60aa7e1ae46a5be704feec9fe4032a33ee Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 23 May 2006 18:38:29 +0000 Subject: [PATCH 31/97] multilib --- libgnomecanvas.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 1c604ef..4bfb3f0 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -54,8 +54,8 @@ rm -rf %{buildroot} export tagname=CC make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/libglade/2.0/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} +rm -f $RPM_BUILD_ROOT%{_libdir}/libglade/2.0/*.{a,la} %find_lang %{gettext_package} From a3fb4bbaf3675471aae1b84be584876ddd553fa8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 6 Jun 2006 03:21:49 +0000 Subject: [PATCH 32/97] Rebuild --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 4bfb3f0..f24d021 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -8,7 +8,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.14.0 -Release: 2 +Release: 3 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -86,6 +86,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Mon Jun 5 2006 Matthias Clasen - 2.14.0-3 +- Rebuild + * Tue May 23 2006 Matthias Clasen - 2.14.0-2 - Fix multilib conflicts - Don't ship .la files From e772cd98b3716ecdc64cf5906769b7803a6ba23a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 9 Jun 2006 14:46:41 +0000 Subject: [PATCH 33/97] fix build reqs --- libgnomecanvas.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index f24d021..794a174 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -8,7 +8,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.14.0 -Release: 3 +Release: 4 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -18,7 +18,7 @@ Requires: gtk2 >= %{gtk2_version} BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: libart_lgpl-devel >= %{libart_lgpl_version} BuildRequires: libglade2-devel >= %{libglade2_version} -BuildRequires: libtool +BuildRequires: libtool gettext %description The canvas widget allows you to create custom displays using stock items @@ -86,6 +86,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Fri Jun 9 2006 Matthias Clasen - 2.14.0-4 +- Add missing BuildRequires + * Mon Jun 5 2006 Matthias Clasen - 2.14.0-3 - Rebuild From 85ce5aca2d5e9e49bc3cbd9167bb8df26f57dcca Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 12 Jul 2006 06:50:47 +0000 Subject: [PATCH 34/97] bumped for rebuild --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 794a174..2b1e47e 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -8,7 +8,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.14.0 -Release: 4 +Release: 4.1 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -86,6 +86,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Wed Jul 12 2006 Jesse Keating - 2.14.0-4.1 +- rebuild + * Fri Jun 9 2006 Matthias Clasen - 2.14.0-4 - Add missing BuildRequires From b2c302fc8991be05f3dd15c3bdaa0ff0a3682bf8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 8 Dec 2006 04:56:20 +0000 Subject: [PATCH 35/97] spec file cleanups --- libgnomecanvas.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 2b1e47e..eb974eb 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -1,4 +1,3 @@ - %define gettext_package libgnomecanvas-2.0 %define gtk2_version 2.1.2 @@ -8,12 +7,12 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.14.0 -Release: 4.1 +Release: 5%{?dist} URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 License: LGPL Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gtk2 >= %{gtk2_version} BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: libart_lgpl-devel >= %{libart_lgpl_version} @@ -28,11 +27,12 @@ Tk canvas widget but has evolved quite a bit over time. %package devel Summary: Libraries and headers for libgnomecanvas Group: Development/Libraries -Requires: %name = %{version} +Requires: %name = %{version}-%{release} Conflicts: gnome-libs-devel < 1.4.1.2 Requires: gtk2-devel >= %{gtk2_version} Requires: libart_lgpl-devel >= %{libart_lgpl_version} Requires: libglade2-devel >= %{libglade2_version} +Requires: pkgconfig %description devel @@ -83,9 +83,12 @@ rm -rf %{buildroot} %{_libdir}/lib*.so %{_libdir}/pkgconfig/* %{_includedir}/* -%{_datadir}/gtk-doc +%{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Thu Dec 7 2006 Matthias Clasen - 2.14.0-5 +- Small spec file cleanups + * Wed Jul 12 2006 Jesse Keating - 2.14.0-4.1 - rebuild From 711bce36fddbd9a2dffc2bb26203101eded8dd5d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 8 Dec 2006 04:57:23 +0000 Subject: [PATCH 36/97] fix more --- libgnomecanvas.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index eb974eb..d48929a 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -9,7 +9,7 @@ Name: libgnomecanvas Version: 2.14.0 Release: 5%{?dist} URL: http://www.gnome.org/ -Source0: %{name}-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/gnome/sources/libgnomecanvas/2.14/%{name}-%{version}.tar.bz2 License: LGPL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From 5f2c2c2549d7ee0280f78058d4cfaa78833a9bee Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 10 Jul 2007 16:10:34 +0000 Subject: [PATCH 37/97] 2.19.0 --- .cvsignore | 10 +--------- libgnomecanvas.spec | 15 +++++++++++---- sources | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2832a90..7b560e0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,9 +1 @@ -libgnomecanvas-2.7.92.tar.bz2 -libgnomecanvas-2.8.0.tar.bz2 -libgnomecanvas-2.9.1.tar.bz2 -libgnomecanvas-2.9.2.tar.bz2 -libgnomecanvas-2.10.0.tar.bz2 -libgnomecanvas-2.11.1.tar.bz2 -libgnomecanvas-2.12.0.tar.bz2 -libgnomecanvas-2.13.0.tar.bz2 -libgnomecanvas-2.14.0.tar.bz2 +libgnomecanvas-2.19.0.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index d48929a..5d39ea0 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,13 +3,14 @@ %define gtk2_version 2.1.2 %define libart_lgpl_version 2.3.8 %define libglade2_version 2.0.1 +%define gail_version 1.9.0 Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.14.0 -Release: 5%{?dist} +Version: 2.19.0 +Release: 1%{?dist} URL: http://www.gnome.org/ -Source0: http://ftp.gnome.org/pub/gnome/sources/libgnomecanvas/2.14/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/libgnomecanvas/2.19/%{name}-%{version}.tar.bz2 License: LGPL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -17,6 +18,7 @@ Requires: gtk2 >= %{gtk2_version} BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: libart_lgpl-devel >= %{libart_lgpl_version} BuildRequires: libglade2-devel >= %{libglade2_version} +BuildRequires: gail-devel >= %{gail_version} BuildRequires: libtool gettext %description @@ -32,7 +34,9 @@ Conflicts: gnome-libs-devel < 1.4.1.2 Requires: gtk2-devel >= %{gtk2_version} Requires: libart_lgpl-devel >= %{libart_lgpl_version} Requires: libglade2-devel >= %{libglade2_version} -Requires: pkgconfig +Requires: pkgconfig +# for /usr/share/gtk-doc/html +Requires: gtk-doc %description devel @@ -86,6 +90,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Tue Jul 10 2007 Matthias Clasen - 2.19.0-1 +- Update to 2.19.0 + * Thu Dec 7 2006 Matthias Clasen - 2.14.0-5 - Small spec file cleanups diff --git a/sources b/sources index 7016536..4aac92f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -516c46fb4a1401b05cfef58c350fbd3d libgnomecanvas-2.14.0.tar.bz2 +6646b21f21a2c5cad75339e1cd02a1ef libgnomecanvas-2.19.0.tar.bz2 From d67c1976519603358a4b27e66f199864b0ba2522 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 10 Jul 2007 16:43:58 +0000 Subject: [PATCH 38/97] fix BRs --- libgnomecanvas.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 5d39ea0..4450dc4 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -20,6 +20,7 @@ BuildRequires: libart_lgpl-devel >= %{libart_lgpl_version} BuildRequires: libglade2-devel >= %{libglade2_version} BuildRequires: gail-devel >= %{gail_version} BuildRequires: libtool gettext +BuildRequires: perl(XML::Parser) %description The canvas widget allows you to create custom displays using stock items From 07e2f5a114a6d6d3147c8ab87bc5e225e4dcd246 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 11 Jul 2007 13:57:06 +0000 Subject: [PATCH 39/97] 2.19.1 --- .cvsignore | 2 +- libgnomecanvas.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7b560e0..61f0c2e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgnomecanvas-2.19.0.tar.bz2 +libgnomecanvas-2.19.1.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 4450dc4..fbb2aba 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,7 +7,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.19.0 +Version: 2.19.1 Release: 1%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.19/%{name}-%{version}.tar.bz2 @@ -91,6 +91,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Wed Jul 11 2007 Matthias Clasen - 2.19.1-1 +- Update to 2.19.1 + * Tue Jul 10 2007 Matthias Clasen - 2.19.0-1 - Update to 2.19.0 diff --git a/sources b/sources index 4aac92f..b14c5bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6646b21f21a2c5cad75339e1cd02a1ef libgnomecanvas-2.19.0.tar.bz2 +1cf4fa53fd6330f560a2875e9b4f2e52 libgnomecanvas-2.19.1.tar.bz2 From 7bc4464fa878b867baccba1b0208cf761abdb5c8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 8 Aug 2007 03:55:56 +0000 Subject: [PATCH 40/97] update license field --- libgnomecanvas.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index fbb2aba..b32aa0f 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -8,10 +8,10 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.19.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.19/%{name}-%{version}.tar.bz2 -License: LGPL +License: LGPLv2+ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gtk2 >= %{gtk2_version} @@ -73,24 +73,23 @@ rm -rf %{buildroot} %files -f %{gettext_package}.lang %defattr(-,root,root) - -%doc COPYING.LIB ChangeLog NEWS - +%doc COPYING.LIB AUTHORS NEWS README %{_libdir}/lib*.so.* - %dir %{_libdir}/libglade %dir %{_libdir}/libglade/2.0 %{_libdir}/libglade/2.0/libcanvas.so %files devel %defattr(-,root,root) - %{_libdir}/lib*.so %{_libdir}/pkgconfig/* %{_includedir}/* %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Tue Aug 7 2007 Matthias Clasen - 2.19.1-2 +- Update the license field + * Wed Jul 11 2007 Matthias Clasen - 2.19.1-1 - Update to 2.19.1 From 484e0e26b7235edfb1010d11f7491d20e2b9fad1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 15 Aug 2007 02:53:45 +0000 Subject: [PATCH 41/97] 2.19.2 --- .cvsignore | 2 +- libgnomecanvas.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 61f0c2e..524c427 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgnomecanvas-2.19.1.tar.bz2 +libgnomecanvas-2.19.2.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index b32aa0f..b029d79 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,8 +7,8 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.19.1 -Release: 2%{?dist} +Version: 2.19.2 +Release: 1%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.19/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -87,6 +87,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Tue Aug 14 2007 Matthias Clasen - 2.19.2-1 +- Update to 2.19.2 + * Tue Aug 7 2007 Matthias Clasen - 2.19.1-2 - Update the license field diff --git a/sources b/sources index b14c5bd..1953a32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1cf4fa53fd6330f560a2875e9b4f2e52 libgnomecanvas-2.19.1.tar.bz2 +fd14cd97dbd9d626cf2a7c0b7e7ac2ee libgnomecanvas-2.19.2.tar.bz2 From 6944c71d201e4b5448d292131128ceb826f1bcc4 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Sat, 25 Aug 2007 17:07:50 +0000 Subject: [PATCH 42/97] - Apply patch from Federico Mena Quintero to avoid tearing during scrolls and such (See http://mail.gnome.org/archives/desktop-devel-list/2007-August/msg00159. html) --- libgnomecanvas-2.19.2-avoid-tearing.patch | 304 ++++++++++++++++++++++ libgnomecanvas.spec | 11 +- 2 files changed, 314 insertions(+), 1 deletion(-) create mode 100644 libgnomecanvas-2.19.2-avoid-tearing.patch diff --git a/libgnomecanvas-2.19.2-avoid-tearing.patch b/libgnomecanvas-2.19.2-avoid-tearing.patch new file mode 100644 index 0000000..a3b9938 --- /dev/null +++ b/libgnomecanvas-2.19.2-avoid-tearing.patch @@ -0,0 +1,304 @@ +diff -up libgnomecanvas-2.19.2/libgnomecanvas/gnome-canvas.c.avoid-tearing libgnomecanvas-2.19.2/libgnomecanvas/gnome-canvas.c +--- libgnomecanvas-2.19.2/libgnomecanvas/gnome-canvas.c.avoid-tearing 2007-08-01 09:56:16.000000000 -0400 ++++ libgnomecanvas-2.19.2/libgnomecanvas/gnome-canvas.c 2007-08-25 13:03:36.000000000 -0400 +@@ -2904,11 +2904,7 @@ gnome_canvas_focus_out (GtkWidget *widge + return FALSE; + } + +-#define IMAGE_WIDTH 512 +-#define IMAGE_HEIGHT 512 +- +-#define IMAGE_WIDTH_AA 256 +-#define IMAGE_HEIGHT_AA 64 ++#define REDRAW_QUANTUM_SIZE 512 + + static void + gnome_canvas_paint_rect (GnomeCanvas *canvas, gint x0, gint y0, gint x1, gint y1) +@@ -2916,9 +2912,7 @@ gnome_canvas_paint_rect (GnomeCanvas *ca + GtkWidget *widget; + gint draw_x1, draw_y1; + gint draw_x2, draw_y2; +- gint xblock, yblock; +- guchar *px; +- GdkPixmap *pixmap; ++ gint draw_width, draw_height; + + g_return_if_fail (!canvas->need_update); + +@@ -2929,94 +2923,91 @@ gnome_canvas_paint_rect (GnomeCanvas *ca + draw_x2 = MIN (draw_x1 + GTK_WIDGET (canvas)->allocation.width, x1); + draw_y2 = MIN (draw_y1 + GTK_WIDGET (canvas)->allocation.height, y1); + +- /* As we can come from expose, we have to tile here */ +- xblock = (canvas->aa) ? IMAGE_WIDTH_AA : IMAGE_WIDTH; +- yblock = (canvas->aa) ? IMAGE_HEIGHT_AA : IMAGE_HEIGHT; +- +- px = NULL; +- pixmap = NULL; +- +- for (y0 = draw_y1; y0 < draw_y2; y0 += yblock) { +- y1 = MIN (y0 + yblock, draw_y2); +- for (x0 = draw_x1; x0 < draw_x2; x0 += xblock) { +- x1 = MIN (x0 + xblock, draw_x2); +- +- canvas->redraw_x1 = x0; +- canvas->redraw_y1 = y0; +- canvas->redraw_x2 = x1; +- canvas->redraw_y2 = y1; +- canvas->draw_xofs = x0; +- canvas->draw_yofs = y0; +- +- if (canvas->aa) { +- GnomeCanvasBuf buf; +- GdkColor *color; +- +- if (!px) px = g_new (guchar, IMAGE_WIDTH_AA * IMAGE_HEIGHT_AA * 3); +- +- buf.buf = px; +- buf.buf_rowstride = IMAGE_WIDTH_AA * 3; +- buf.rect.x0 = x0; +- buf.rect.y0 = y0; +- buf.rect.x1 = x1; +- buf.rect.y1 = y1; +- color = &widget->style->bg[GTK_STATE_NORMAL]; +- buf.bg_color = (((color->red & 0xff00) << 8) | (color->green & 0xff00) | (color->blue >> 8)); +- buf.is_bg = 1; +- buf.is_buf = 0; +- +- g_signal_emit (G_OBJECT (canvas), canvas_signals[RENDER_BACKGROUND], 0, &buf); +- +- if (canvas->root->object.flags & GNOME_CANVAS_ITEM_VISIBLE) +- (* GNOME_CANVAS_ITEM_GET_CLASS (canvas->root)->render) (canvas->root, &buf); +- +- if (buf.is_bg) { +- gdk_rgb_gc_set_foreground (canvas->pixmap_gc, buf.bg_color); +- gdk_draw_rectangle (canvas->layout.bin_window, +- canvas->pixmap_gc, +- TRUE, +- (x0 + canvas->zoom_xofs), +- (y0 + canvas->zoom_yofs), +- x1 - x0, y1 - y0); +- } else { +- gdk_draw_rgb_image_dithalign (canvas->layout.bin_window, +- canvas->pixmap_gc, +- (x0 + canvas->zoom_xofs), +- (y0 + canvas->zoom_yofs), +- x1 - x0, y1 - y0, +- canvas->dither, +- buf.buf, +- IMAGE_WIDTH_AA * 3, +- x0, y0); +- } +- } else { +- if (!pixmap) pixmap = gdk_pixmap_new (canvas->layout.bin_window, IMAGE_WIDTH, IMAGE_HEIGHT, +- gtk_widget_get_visual (widget)->depth); +- +- g_signal_emit (G_OBJECT (canvas), canvas_signals[DRAW_BACKGROUND], 0, pixmap, +- x0, y0, x1 - x0, y1 - y0); +- +- if (canvas->root->object.flags & GNOME_CANVAS_ITEM_VISIBLE) +- (* GNOME_CANVAS_ITEM_GET_CLASS ( +- canvas->root)->draw) ( +- canvas->root, pixmap, +- x0, y0, +- x1 - x0, y1 - y0); +- /* Copy the pixmap to the window and clean up */ +- +- gdk_draw_pixmap (canvas->layout.bin_window, +- canvas->pixmap_gc, +- pixmap, +- 0, 0, +- x0 + canvas->zoom_xofs, +- y0 + canvas->zoom_yofs, +- x1 - x0, y1 - y0); +- } ++ draw_width = draw_x2 - draw_x1; ++ draw_height = draw_y2 - draw_y1; ++ ++ if (draw_width < 1 || draw_height < 1) ++ return; ++ ++ canvas->redraw_x1 = draw_x1; ++ canvas->redraw_y1 = draw_y1; ++ canvas->redraw_x2 = draw_x2; ++ canvas->redraw_y2 = draw_y2; ++ canvas->draw_xofs = draw_x1; ++ canvas->draw_yofs = draw_y1; ++ ++ if (canvas->aa) { ++ GnomeCanvasBuf buf; ++ guchar *px; ++ GdkColor *color; ++ ++ px = g_new (guchar, draw_width * 3 * draw_height); ++ ++ buf.buf = px; ++ buf.buf_rowstride = draw_width * 3; ++ buf.rect.x0 = draw_x1; ++ buf.rect.y0 = draw_y1; ++ buf.rect.x1 = draw_x2; ++ buf.rect.y1 = draw_y2; ++ color = &widget->style->bg[GTK_STATE_NORMAL]; ++ buf.bg_color = (((color->red & 0xff00) << 8) | (color->green & 0xff00) | (color->blue >> 8)); ++ buf.is_bg = 1; ++ buf.is_buf = 0; ++ ++ g_signal_emit (G_OBJECT (canvas), canvas_signals[RENDER_BACKGROUND], 0, &buf); ++ ++ if (canvas->root->object.flags & GNOME_CANVAS_ITEM_VISIBLE) ++ (* GNOME_CANVAS_ITEM_GET_CLASS (canvas->root)->render) (canvas->root, &buf); ++ ++ if (buf.is_bg) { ++ gdk_rgb_gc_set_foreground (canvas->pixmap_gc, buf.bg_color); ++ gdk_draw_rectangle (canvas->layout.bin_window, ++ canvas->pixmap_gc, ++ TRUE, ++ (draw_x1 + canvas->zoom_xofs), ++ (draw_y1 + canvas->zoom_yofs), ++ draw_width, draw_height); ++ } else { ++ gdk_draw_rgb_image_dithalign (canvas->layout.bin_window, ++ canvas->pixmap_gc, ++ (draw_x1 + canvas->zoom_xofs), ++ (draw_y1 + canvas->zoom_yofs), ++ draw_width, draw_height, ++ canvas->dither, ++ buf.buf, ++ buf.buf_rowstride, ++ draw_x1, draw_y1); + } +- } + +- if (px) g_free (px); +- if (pixmap) gdk_pixmap_unref (pixmap); ++ g_free (px); ++ } else { ++ GdkPixmap *pixmap; ++ ++ pixmap = gdk_pixmap_new (canvas->layout.bin_window, ++ draw_width, draw_height, ++ gtk_widget_get_visual (widget)->depth); ++ ++ g_signal_emit (G_OBJECT (canvas), canvas_signals[DRAW_BACKGROUND], 0, pixmap, ++ draw_x1, draw_y1, draw_width, draw_height); ++ ++ if (canvas->root->object.flags & GNOME_CANVAS_ITEM_VISIBLE) ++ (* GNOME_CANVAS_ITEM_GET_CLASS (canvas->root)->draw) ( ++ canvas->root, pixmap, ++ draw_x1, draw_y1, ++ draw_width, draw_height); ++ ++ /* Copy the pixmap to the window and clean up */ ++ ++ gdk_draw_pixmap (canvas->layout.bin_window, ++ canvas->pixmap_gc, ++ pixmap, ++ 0, 0, ++ draw_x1 + canvas->zoom_xofs, ++ draw_y1 + canvas->zoom_yofs, ++ draw_width, draw_height); ++ ++ gdk_pixmap_unref (pixmap); ++ } + } + + /* Expose handler for the canvas */ +@@ -3074,48 +3065,68 @@ paint (GnomeCanvas *canvas) + { + ArtIRect *rects; + gint n_rects, i; +- +- if (canvas->aa) +- rects = art_rect_list_from_uta (canvas->redraw_area, +- IMAGE_WIDTH_AA, IMAGE_HEIGHT_AA, +- &n_rects); +- else +- rects = art_rect_list_from_uta (canvas->redraw_area, +- IMAGE_WIDTH, IMAGE_HEIGHT, +- &n_rects); ++ ArtIRect visible_rect; ++ GdkRegion *region; ++ GdkEventExpose expose_event; ++ GdkRectangle region_area; ++ ++ /* Extract big rectangles from the microtile array */ ++ ++ rects = art_rect_list_from_uta (canvas->redraw_area, ++ REDRAW_QUANTUM_SIZE, REDRAW_QUANTUM_SIZE, ++ &n_rects); + + art_uta_free (canvas->redraw_area); + canvas->redraw_area = NULL; + canvas->need_redraw = FALSE; + +- /* Send synthetic expose events */ ++ /* Turn those rectangles into a GdkRegion for exposing */ ++ ++ visible_rect.x0 = canvas->layout.hadjustment->value; ++ visible_rect.y0 = canvas->layout.vadjustment->value; ++ visible_rect.x1 = visible_rect.x0 + GTK_WIDGET (canvas)->allocation.width; ++ visible_rect.y1 = visible_rect.y0 + GTK_WIDGET (canvas)->allocation.height; ++ ++ region = gdk_region_new (); ++ + for (i = 0; i < n_rects; i++) { +- GdkEventExpose ex; +- gint x0, y0, x1, y1; ++ ArtIRect clipped; + +- x0 = MAX (canvas->layout.hadjustment->value - canvas->zoom_xofs, rects[i].x0); +- y0 = MAX (canvas->layout.vadjustment->value - canvas->zoom_yofs, rects[i].y0); +- x1 = MIN (x0 + GTK_WIDGET (canvas)->allocation.width, rects[i].x1); +- y1 = MIN (y0 + GTK_WIDGET (canvas)->allocation.height, rects[i].y1); +- +- if ((x0 < x1) && (y0 < y1)) { +- /* Here we are - whatever type is canvas, we have to send synthetic expose to layout (Lauris) */ +- ex.type = GDK_EXPOSE; +- ex.window = canvas->layout.bin_window; +- ex.send_event = TRUE; +- ex.area.x = x0 + canvas->zoom_xofs; +- ex.area.y = y0 + canvas->zoom_yofs; +- ex.area.width = x1 - x0; +- ex.area.height = y1 - y0; +- ex.region = gdk_region_rectangle (&ex.area); +- ex.count = 0; +- gtk_widget_send_expose (GTK_WIDGET (canvas), (GdkEvent *) &ex); +- gdk_region_destroy (ex.region); ++ art_irect_intersect (&clipped, &visible_rect, rects + i); ++ if (!art_irect_empty (&clipped)) { ++ GdkRectangle gdkrect; ++ ++ gdkrect.x = clipped.x0; ++ gdkrect.y = clipped.y0; ++ gdkrect.width = clipped.x1 - clipped.x0; ++ gdkrect.height = clipped.y1 - clipped.y0; ++ ++ gdk_region_union_with_rect (region, &gdkrect); + } + } + + art_free (rects); + ++ /* Expose! */ ++ ++ gdk_region_get_clipbox (region, ®ion_area); ++ ++ expose_event.type = GDK_EXPOSE; ++ expose_event.window = canvas->layout.bin_window; ++ expose_event.send_event = TRUE; ++ expose_event.area.x = region_area.x; ++ expose_event.area.y = region_area.y; ++ expose_event.area.width = region_area.width; ++ expose_event.area.height = region_area.height; ++ expose_event.region = region; ++ expose_event.count = 0; ++ ++ gdk_window_begin_paint_region (canvas->layout.bin_window, region); ++ gtk_widget_send_expose (GTK_WIDGET (canvas), (GdkEvent *) &expose_event); ++ gdk_window_end_paint (canvas->layout.bin_window); ++ ++ gdk_region_destroy (region); ++ + canvas->redraw_x1 = 0; + canvas->redraw_y1 = 0; + canvas->redraw_x2 = 0; diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index b029d79..afbf5e0 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -8,7 +8,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.19.2 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.19/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -22,6 +22,9 @@ BuildRequires: gail-devel >= %{gail_version} BuildRequires: libtool gettext BuildRequires: perl(XML::Parser) +# http://mail.gnome.org/archives/desktop-devel-list/2007-August/msg00159.html +Patch0: libgnomecanvas-2.19.2-avoid-tearing.patch + %description The canvas widget allows you to create custom displays using stock items such as circles, lines, text, and so on. It was originally a port of the @@ -47,6 +50,7 @@ Tk canvas widget but has evolved quite a bit over time. %prep %setup -q +%patch0 -p1 -b .avoid-tearing %build export CFLAGS=$(echo $RPM_OPT_FLAGS |sed -e 's/O2/O1/g') @@ -87,6 +91,11 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Sat Aug 25 2007 Ray Strode - 2.19.2-2 +- Apply patch from Federico Mena Quintero to avoid + tearing during scrolls and such + (See http://mail.gnome.org/archives/desktop-devel-list/2007-August/msg00159.html) + * Tue Aug 14 2007 Matthias Clasen - 2.19.2-1 - Update to 2.19.2 From c4a83eeb747e8602c7d9a571712b0fb5c660a9cb Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 18 Sep 2007 03:38:34 +0000 Subject: [PATCH 43/97] 2.20.0 --- .cvsignore | 2 +- libgnomecanvas.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 524c427..5baf131 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgnomecanvas-2.19.2.tar.bz2 +libgnomecanvas-2.20.0.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index afbf5e0..5347992 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,10 +7,10 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.19.2 -Release: 2%{?dist} +Version: 2.20.0 +Release: 1%{?dist} URL: http://www.gnome.org/ -Source0: http://download.gnome.org/sources/libgnomecanvas/2.19/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/libgnomecanvas/2.20/%{name}-%{version}.tar.bz2 License: LGPLv2+ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -91,6 +91,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Mon Sep 17 2007 Matthias Clasen 2.20.0-1 +- Update to 2.20.0 + * Sat Aug 25 2007 Ray Strode - 2.19.2-2 - Apply patch from Federico Mena Quintero to avoid tearing during scrolls and such diff --git a/sources b/sources index 1953a32..731c39f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd14cd97dbd9d626cf2a7c0b7e7ac2ee libgnomecanvas-2.19.2.tar.bz2 +109b71b02e0c976d65b46129d0ad69d1 libgnomecanvas-2.20.0.tar.bz2 From ace23909346063681622d46f41301d18a22eb477 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 9 Oct 2007 15:45:34 +0000 Subject: [PATCH 44/97] Remove the scrolling patch --- libgnomecanvas.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 5347992..8f2a272 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -8,7 +8,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.20.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.20/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -22,9 +22,6 @@ BuildRequires: gail-devel >= %{gail_version} BuildRequires: libtool gettext BuildRequires: perl(XML::Parser) -# http://mail.gnome.org/archives/desktop-devel-list/2007-August/msg00159.html -Patch0: libgnomecanvas-2.19.2-avoid-tearing.patch - %description The canvas widget allows you to create custom displays using stock items such as circles, lines, text, and so on. It was originally a port of the @@ -50,7 +47,6 @@ Tk canvas widget but has evolved quite a bit over time. %prep %setup -q -%patch0 -p1 -b .avoid-tearing %build export CFLAGS=$(echo $RPM_OPT_FLAGS |sed -e 's/O2/O1/g') @@ -91,6 +87,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Tue Oct 9 2007 Matthias Clasen 2.20.0-2 +- Take out the scrolling patch, since it causes redraw problems (#289281) + * Mon Sep 17 2007 Matthias Clasen 2.20.0-1 - Update to 2.20.0 From 5ca96d4496e153379587048dd599c8117c280979 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 15 Oct 2007 19:00:53 +0000 Subject: [PATCH 45/97] makefile update to properly grab makefile.common --- Makefile | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index de0356f..54e939a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,21 @@ # Makefile for source rpm: libgnomecanvas -# $Id$ +# $Id: Makefile,v 1.1 2004/09/09 07:27:36 cvsdist Exp $ NAME := libgnomecanvas SPECFILE = $(firstword $(wildcard *.spec)) -include ../common/Makefile.common +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attempt a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) From e37e196215171479f22499e91edb58664748dba2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 16 Oct 2007 00:48:08 +0000 Subject: [PATCH 46/97] 2.20.1 --- .cvsignore | 2 +- libgnomecanvas.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5baf131..5dfcddf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgnomecanvas-2.20.0.tar.bz2 +libgnomecanvas-2.20.1.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 8f2a272..c67cae4 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,8 +7,8 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.20.0 -Release: 2%{?dist} +Version: 2.20.1 +Release: 1%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.20/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -87,6 +87,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Mon Oct 15 2007 Matthias Clasen 2.20.1-1 +- Update to 2.20.1 (translation updates) + * Tue Oct 9 2007 Matthias Clasen 2.20.0-2 - Take out the scrolling patch, since it causes redraw problems (#289281) diff --git a/sources b/sources index 731c39f..49896c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -109b71b02e0c976d65b46129d0ad69d1 libgnomecanvas-2.20.0.tar.bz2 +49574f1be192abc191dd1eed72fcbe03 libgnomecanvas-2.20.1.tar.bz2 From 61e0c45c245f07d833459aaaad20d2fabb80988b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 12 Nov 2007 19:37:50 +0000 Subject: [PATCH 47/97] re-add the tear avoidance patch, with an extra zoom redraw fix --- libgnomecanvas.spec | 9 +++++++- zoom-redraw-fix.patch | 53 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 zoom-redraw-fix.patch diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index c67cae4..fdbf18d 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -8,9 +8,11 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.20.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.20/%{name}-%{version}.tar.bz2 +Patch0: libgnomecanvas-2.19.2-avoid-tearing.patch +Patch1: zoom-redraw-fix.patch License: LGPLv2+ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -47,6 +49,8 @@ Tk canvas widget but has evolved quite a bit over time. %prep %setup -q +%patch0 -p1 -b .avoid-tearing +%patch1 -p1 -b .zoom-redraw-fix %build export CFLAGS=$(echo $RPM_OPT_FLAGS |sed -e 's/O2/O1/g') @@ -87,6 +91,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Mon Nov 12 2007 Matthias Clasen 2.20.1-2 +- Readd the scrolling patch, with an extra fix for redraw problems + * Mon Oct 15 2007 Matthias Clasen 2.20.1-1 - Update to 2.20.1 (translation updates) diff --git a/zoom-redraw-fix.patch b/zoom-redraw-fix.patch new file mode 100644 index 0000000..fe109b5 --- /dev/null +++ b/zoom-redraw-fix.patch @@ -0,0 +1,53 @@ +2007-11-05 Federico Mena Quintero + + Fix these bugs: + http://bugzilla.gnome.org/show_bug.cgi?id=493808 + https://bugzilla.novell.com/show_bug.cgi?id=336941 + + * libgnomecanvas/gnome-canvas.c (paint): Oops, use the correct + visible rectangle; we forgot to take the zoom_{x,y}ofs into + account. Also, take those offsets into account when generating + the actual rectangle to be added to the GdkRegion. + +diff --git a/libgnomecanvas/gnome-canvas.c b/libgnomecanvas/gnome-canvas.c +index 5e89bc2..ca9769f 100644 +--- a/libgnomecanvas/gnome-canvas.c ++++ b/libgnomecanvas/gnome-canvas.c +@@ -3040,6 +3040,7 @@ gnome_canvas_expose (GtkWidget *widget, GdkEventExpose *event) + + if (canvas->need_update || canvas->need_redraw) { + ArtUta *uta; ++ + /* Update or drawing is scheduled, so just mark exposed area as dirty */ + uta = art_uta_from_irect (&rect); + gnome_canvas_request_redraw_uta (canvas, uta); +@@ -3082,8 +3083,8 @@ paint (GnomeCanvas *canvas) + + /* Turn those rectangles into a GdkRegion for exposing */ + +- visible_rect.x0 = canvas->layout.hadjustment->value; +- visible_rect.y0 = canvas->layout.vadjustment->value; ++ visible_rect.x0 = canvas->layout.hadjustment->value - canvas->zoom_xofs; ++ visible_rect.y0 = canvas->layout.vadjustment->value - canvas->zoom_yofs; + visible_rect.x1 = visible_rect.x0 + GTK_WIDGET (canvas)->allocation.width; + visible_rect.y1 = visible_rect.y0 + GTK_WIDGET (canvas)->allocation.height; + +@@ -3096,8 +3097,8 @@ paint (GnomeCanvas *canvas) + if (!art_irect_empty (&clipped)) { + GdkRectangle gdkrect; + +- gdkrect.x = clipped.x0; +- gdkrect.y = clipped.y0; ++ gdkrect.x = clipped.x0 + canvas->zoom_xofs; ++ gdkrect.y = clipped.y0 + canvas->zoom_yofs; + gdkrect.width = clipped.x1 - clipped.x0; + gdkrect.height = clipped.y1 - clipped.y0; + +@@ -3200,6 +3201,7 @@ idle_handler (gpointer data) + GDK_THREADS_ENTER (); + + canvas = GNOME_CANVAS (data); ++ + do_update (canvas); + + /* Reset idle id */ From a7675d7fd2fffadfabd5199091401e9959ebc5f4 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 13 Nov 2007 17:41:24 +0000 Subject: [PATCH 48/97] 2.20.1.1 --- .cvsignore | 2 +- libgnomecanvas.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5dfcddf..a04c6a5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgnomecanvas-2.20.1.tar.bz2 +libgnomecanvas-2.20.1.1.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index fdbf18d..18739b6 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,8 +7,8 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.20.1 -Release: 2%{?dist} +Version: 2.20.1.1 +Release: 1%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.20/%{name}-%{version}.tar.bz2 Patch0: libgnomecanvas-2.19.2-avoid-tearing.patch @@ -91,6 +91,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Tue Nov 13 2007 Matthias Clasen 2.20.1.1-1 +- Update to 2.20.1.1 + * Mon Nov 12 2007 Matthias Clasen 2.20.1-2 - Readd the scrolling patch, with an extra fix for redraw problems diff --git a/sources b/sources index 49896c3..54eb999 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -49574f1be192abc191dd1eed72fcbe03 libgnomecanvas-2.20.1.tar.bz2 +948ed771d2957d24a0c9a414e9581055 libgnomecanvas-2.20.1.1.tar.bz2 From ad63b866e368706a12cae0fcf9d7960c22c69a44 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 9 Feb 2008 05:13:01 +0000 Subject: [PATCH 49/97] rebuild --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 18739b6..5c81ffe 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -8,7 +8,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.20.1.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.20/%{name}-%{version}.tar.bz2 Patch0: libgnomecanvas-2.19.2-avoid-tearing.patch @@ -91,6 +91,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Sat Feb 9 2008 Matthias Clasen 2.20.1.1-2 +- Rebuild for gcc 4.3 + * Tue Nov 13 2007 Matthias Clasen 2.20.1.1-1 - Update to 2.20.1.1 From c92dc5bc2562fc0e21946f47346f5cd3ad2f466e Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Sat, 8 Nov 2008 18:57:02 +0000 Subject: [PATCH 50/97] - Disown %{_libdir}/libglade and %{_libdir}/libglade/2.0, and add 'Requires: libglade2' instead. --- libgnomecanvas.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 5c81ffe..afbbdfd 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -8,7 +8,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.20.1.1 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.20/%{name}-%{version}.tar.bz2 Patch0: libgnomecanvas-2.19.2-avoid-tearing.patch @@ -17,6 +17,7 @@ License: LGPLv2+ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gtk2 >= %{gtk2_version} +Requires: libglade2 BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: libart_lgpl-devel >= %{libart_lgpl_version} BuildRequires: libglade2-devel >= %{libglade2_version} @@ -79,8 +80,6 @@ rm -rf %{buildroot} %defattr(-,root,root) %doc COPYING.LIB AUTHORS NEWS README %{_libdir}/lib*.so.* -%dir %{_libdir}/libglade -%dir %{_libdir}/libglade/2.0 %{_libdir}/libglade/2.0/libcanvas.so %files devel @@ -91,6 +90,10 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Sun Nov 09 2008 Debarshi Ray 2.20.1.1-3 +- Disown %%{_libdir}/libglade and %%{_libdir}/libglade/2.0, and add + 'Requires: libglade2' instead. + * Sat Feb 9 2008 Matthias Clasen 2.20.1.1-2 - Rebuild for gcc 4.3 From f993cca7be62376cf9cbd8de6d1295a7edc3794e Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Sat, 8 Nov 2008 20:00:00 +0000 Subject: [PATCH 51/97] - Use 'Requires: libglade2 >= 2.6.3-2' to prevent unowned %{_libdir}/libglade and %{_libdir}/libglade/2.0. --- libgnomecanvas.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index afbbdfd..386281c 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -8,7 +8,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.20.1.1 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.20/%{name}-%{version}.tar.bz2 Patch0: libgnomecanvas-2.19.2-avoid-tearing.patch @@ -17,7 +17,7 @@ License: LGPLv2+ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gtk2 >= %{gtk2_version} -Requires: libglade2 +Requires: libglade2 >= 2.6.3-2 BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: libart_lgpl-devel >= %{libart_lgpl_version} BuildRequires: libglade2-devel >= %{libglade2_version} @@ -37,7 +37,7 @@ Requires: %name = %{version}-%{release} Conflicts: gnome-libs-devel < 1.4.1.2 Requires: gtk2-devel >= %{gtk2_version} Requires: libart_lgpl-devel >= %{libart_lgpl_version} -Requires: libglade2-devel >= %{libglade2_version} +Requires: libglade2-devel >= 2.6.3-2 Requires: pkgconfig # for /usr/share/gtk-doc/html Requires: gtk-doc @@ -90,6 +90,10 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Sun Nov 09 2008 Debarshi Ray 2.20.1.1-4 +- Use 'Requires: libglade2 >= 2.6.3-2' to prevent unowned + %%{_libdir}/libglade and %%{_libdir}/libglade/2.0. + * Sun Nov 09 2008 Debarshi Ray 2.20.1.1-3 - Disown %%{_libdir}/libglade and %%{_libdir}/libglade/2.0, and add 'Requires: libglade2' instead. From 6636d55491ed6161f46fdaf099456b14fc36314b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 3 Feb 2009 16:38:34 +0000 Subject: [PATCH 52/97] 2.25.90 --- .cvsignore | 2 +- libgnomecanvas-2.19.2-avoid-tearing.patch | 304 ---------------------- libgnomecanvas.spec | 13 +- sources | 2 +- zoom-redraw-fix.patch | 53 ---- 5 files changed, 8 insertions(+), 366 deletions(-) delete mode 100644 libgnomecanvas-2.19.2-avoid-tearing.patch delete mode 100644 zoom-redraw-fix.patch diff --git a/.cvsignore b/.cvsignore index a04c6a5..55d8fea 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgnomecanvas-2.20.1.1.tar.bz2 +libgnomecanvas-2.25.90.tar.bz2 diff --git a/libgnomecanvas-2.19.2-avoid-tearing.patch b/libgnomecanvas-2.19.2-avoid-tearing.patch deleted file mode 100644 index a3b9938..0000000 --- a/libgnomecanvas-2.19.2-avoid-tearing.patch +++ /dev/null @@ -1,304 +0,0 @@ -diff -up libgnomecanvas-2.19.2/libgnomecanvas/gnome-canvas.c.avoid-tearing libgnomecanvas-2.19.2/libgnomecanvas/gnome-canvas.c ---- libgnomecanvas-2.19.2/libgnomecanvas/gnome-canvas.c.avoid-tearing 2007-08-01 09:56:16.000000000 -0400 -+++ libgnomecanvas-2.19.2/libgnomecanvas/gnome-canvas.c 2007-08-25 13:03:36.000000000 -0400 -@@ -2904,11 +2904,7 @@ gnome_canvas_focus_out (GtkWidget *widge - return FALSE; - } - --#define IMAGE_WIDTH 512 --#define IMAGE_HEIGHT 512 -- --#define IMAGE_WIDTH_AA 256 --#define IMAGE_HEIGHT_AA 64 -+#define REDRAW_QUANTUM_SIZE 512 - - static void - gnome_canvas_paint_rect (GnomeCanvas *canvas, gint x0, gint y0, gint x1, gint y1) -@@ -2916,9 +2912,7 @@ gnome_canvas_paint_rect (GnomeCanvas *ca - GtkWidget *widget; - gint draw_x1, draw_y1; - gint draw_x2, draw_y2; -- gint xblock, yblock; -- guchar *px; -- GdkPixmap *pixmap; -+ gint draw_width, draw_height; - - g_return_if_fail (!canvas->need_update); - -@@ -2929,94 +2923,91 @@ gnome_canvas_paint_rect (GnomeCanvas *ca - draw_x2 = MIN (draw_x1 + GTK_WIDGET (canvas)->allocation.width, x1); - draw_y2 = MIN (draw_y1 + GTK_WIDGET (canvas)->allocation.height, y1); - -- /* As we can come from expose, we have to tile here */ -- xblock = (canvas->aa) ? IMAGE_WIDTH_AA : IMAGE_WIDTH; -- yblock = (canvas->aa) ? IMAGE_HEIGHT_AA : IMAGE_HEIGHT; -- -- px = NULL; -- pixmap = NULL; -- -- for (y0 = draw_y1; y0 < draw_y2; y0 += yblock) { -- y1 = MIN (y0 + yblock, draw_y2); -- for (x0 = draw_x1; x0 < draw_x2; x0 += xblock) { -- x1 = MIN (x0 + xblock, draw_x2); -- -- canvas->redraw_x1 = x0; -- canvas->redraw_y1 = y0; -- canvas->redraw_x2 = x1; -- canvas->redraw_y2 = y1; -- canvas->draw_xofs = x0; -- canvas->draw_yofs = y0; -- -- if (canvas->aa) { -- GnomeCanvasBuf buf; -- GdkColor *color; -- -- if (!px) px = g_new (guchar, IMAGE_WIDTH_AA * IMAGE_HEIGHT_AA * 3); -- -- buf.buf = px; -- buf.buf_rowstride = IMAGE_WIDTH_AA * 3; -- buf.rect.x0 = x0; -- buf.rect.y0 = y0; -- buf.rect.x1 = x1; -- buf.rect.y1 = y1; -- color = &widget->style->bg[GTK_STATE_NORMAL]; -- buf.bg_color = (((color->red & 0xff00) << 8) | (color->green & 0xff00) | (color->blue >> 8)); -- buf.is_bg = 1; -- buf.is_buf = 0; -- -- g_signal_emit (G_OBJECT (canvas), canvas_signals[RENDER_BACKGROUND], 0, &buf); -- -- if (canvas->root->object.flags & GNOME_CANVAS_ITEM_VISIBLE) -- (* GNOME_CANVAS_ITEM_GET_CLASS (canvas->root)->render) (canvas->root, &buf); -- -- if (buf.is_bg) { -- gdk_rgb_gc_set_foreground (canvas->pixmap_gc, buf.bg_color); -- gdk_draw_rectangle (canvas->layout.bin_window, -- canvas->pixmap_gc, -- TRUE, -- (x0 + canvas->zoom_xofs), -- (y0 + canvas->zoom_yofs), -- x1 - x0, y1 - y0); -- } else { -- gdk_draw_rgb_image_dithalign (canvas->layout.bin_window, -- canvas->pixmap_gc, -- (x0 + canvas->zoom_xofs), -- (y0 + canvas->zoom_yofs), -- x1 - x0, y1 - y0, -- canvas->dither, -- buf.buf, -- IMAGE_WIDTH_AA * 3, -- x0, y0); -- } -- } else { -- if (!pixmap) pixmap = gdk_pixmap_new (canvas->layout.bin_window, IMAGE_WIDTH, IMAGE_HEIGHT, -- gtk_widget_get_visual (widget)->depth); -- -- g_signal_emit (G_OBJECT (canvas), canvas_signals[DRAW_BACKGROUND], 0, pixmap, -- x0, y0, x1 - x0, y1 - y0); -- -- if (canvas->root->object.flags & GNOME_CANVAS_ITEM_VISIBLE) -- (* GNOME_CANVAS_ITEM_GET_CLASS ( -- canvas->root)->draw) ( -- canvas->root, pixmap, -- x0, y0, -- x1 - x0, y1 - y0); -- /* Copy the pixmap to the window and clean up */ -- -- gdk_draw_pixmap (canvas->layout.bin_window, -- canvas->pixmap_gc, -- pixmap, -- 0, 0, -- x0 + canvas->zoom_xofs, -- y0 + canvas->zoom_yofs, -- x1 - x0, y1 - y0); -- } -+ draw_width = draw_x2 - draw_x1; -+ draw_height = draw_y2 - draw_y1; -+ -+ if (draw_width < 1 || draw_height < 1) -+ return; -+ -+ canvas->redraw_x1 = draw_x1; -+ canvas->redraw_y1 = draw_y1; -+ canvas->redraw_x2 = draw_x2; -+ canvas->redraw_y2 = draw_y2; -+ canvas->draw_xofs = draw_x1; -+ canvas->draw_yofs = draw_y1; -+ -+ if (canvas->aa) { -+ GnomeCanvasBuf buf; -+ guchar *px; -+ GdkColor *color; -+ -+ px = g_new (guchar, draw_width * 3 * draw_height); -+ -+ buf.buf = px; -+ buf.buf_rowstride = draw_width * 3; -+ buf.rect.x0 = draw_x1; -+ buf.rect.y0 = draw_y1; -+ buf.rect.x1 = draw_x2; -+ buf.rect.y1 = draw_y2; -+ color = &widget->style->bg[GTK_STATE_NORMAL]; -+ buf.bg_color = (((color->red & 0xff00) << 8) | (color->green & 0xff00) | (color->blue >> 8)); -+ buf.is_bg = 1; -+ buf.is_buf = 0; -+ -+ g_signal_emit (G_OBJECT (canvas), canvas_signals[RENDER_BACKGROUND], 0, &buf); -+ -+ if (canvas->root->object.flags & GNOME_CANVAS_ITEM_VISIBLE) -+ (* GNOME_CANVAS_ITEM_GET_CLASS (canvas->root)->render) (canvas->root, &buf); -+ -+ if (buf.is_bg) { -+ gdk_rgb_gc_set_foreground (canvas->pixmap_gc, buf.bg_color); -+ gdk_draw_rectangle (canvas->layout.bin_window, -+ canvas->pixmap_gc, -+ TRUE, -+ (draw_x1 + canvas->zoom_xofs), -+ (draw_y1 + canvas->zoom_yofs), -+ draw_width, draw_height); -+ } else { -+ gdk_draw_rgb_image_dithalign (canvas->layout.bin_window, -+ canvas->pixmap_gc, -+ (draw_x1 + canvas->zoom_xofs), -+ (draw_y1 + canvas->zoom_yofs), -+ draw_width, draw_height, -+ canvas->dither, -+ buf.buf, -+ buf.buf_rowstride, -+ draw_x1, draw_y1); - } -- } - -- if (px) g_free (px); -- if (pixmap) gdk_pixmap_unref (pixmap); -+ g_free (px); -+ } else { -+ GdkPixmap *pixmap; -+ -+ pixmap = gdk_pixmap_new (canvas->layout.bin_window, -+ draw_width, draw_height, -+ gtk_widget_get_visual (widget)->depth); -+ -+ g_signal_emit (G_OBJECT (canvas), canvas_signals[DRAW_BACKGROUND], 0, pixmap, -+ draw_x1, draw_y1, draw_width, draw_height); -+ -+ if (canvas->root->object.flags & GNOME_CANVAS_ITEM_VISIBLE) -+ (* GNOME_CANVAS_ITEM_GET_CLASS (canvas->root)->draw) ( -+ canvas->root, pixmap, -+ draw_x1, draw_y1, -+ draw_width, draw_height); -+ -+ /* Copy the pixmap to the window and clean up */ -+ -+ gdk_draw_pixmap (canvas->layout.bin_window, -+ canvas->pixmap_gc, -+ pixmap, -+ 0, 0, -+ draw_x1 + canvas->zoom_xofs, -+ draw_y1 + canvas->zoom_yofs, -+ draw_width, draw_height); -+ -+ gdk_pixmap_unref (pixmap); -+ } - } - - /* Expose handler for the canvas */ -@@ -3074,48 +3065,68 @@ paint (GnomeCanvas *canvas) - { - ArtIRect *rects; - gint n_rects, i; -- -- if (canvas->aa) -- rects = art_rect_list_from_uta (canvas->redraw_area, -- IMAGE_WIDTH_AA, IMAGE_HEIGHT_AA, -- &n_rects); -- else -- rects = art_rect_list_from_uta (canvas->redraw_area, -- IMAGE_WIDTH, IMAGE_HEIGHT, -- &n_rects); -+ ArtIRect visible_rect; -+ GdkRegion *region; -+ GdkEventExpose expose_event; -+ GdkRectangle region_area; -+ -+ /* Extract big rectangles from the microtile array */ -+ -+ rects = art_rect_list_from_uta (canvas->redraw_area, -+ REDRAW_QUANTUM_SIZE, REDRAW_QUANTUM_SIZE, -+ &n_rects); - - art_uta_free (canvas->redraw_area); - canvas->redraw_area = NULL; - canvas->need_redraw = FALSE; - -- /* Send synthetic expose events */ -+ /* Turn those rectangles into a GdkRegion for exposing */ -+ -+ visible_rect.x0 = canvas->layout.hadjustment->value; -+ visible_rect.y0 = canvas->layout.vadjustment->value; -+ visible_rect.x1 = visible_rect.x0 + GTK_WIDGET (canvas)->allocation.width; -+ visible_rect.y1 = visible_rect.y0 + GTK_WIDGET (canvas)->allocation.height; -+ -+ region = gdk_region_new (); -+ - for (i = 0; i < n_rects; i++) { -- GdkEventExpose ex; -- gint x0, y0, x1, y1; -+ ArtIRect clipped; - -- x0 = MAX (canvas->layout.hadjustment->value - canvas->zoom_xofs, rects[i].x0); -- y0 = MAX (canvas->layout.vadjustment->value - canvas->zoom_yofs, rects[i].y0); -- x1 = MIN (x0 + GTK_WIDGET (canvas)->allocation.width, rects[i].x1); -- y1 = MIN (y0 + GTK_WIDGET (canvas)->allocation.height, rects[i].y1); -- -- if ((x0 < x1) && (y0 < y1)) { -- /* Here we are - whatever type is canvas, we have to send synthetic expose to layout (Lauris) */ -- ex.type = GDK_EXPOSE; -- ex.window = canvas->layout.bin_window; -- ex.send_event = TRUE; -- ex.area.x = x0 + canvas->zoom_xofs; -- ex.area.y = y0 + canvas->zoom_yofs; -- ex.area.width = x1 - x0; -- ex.area.height = y1 - y0; -- ex.region = gdk_region_rectangle (&ex.area); -- ex.count = 0; -- gtk_widget_send_expose (GTK_WIDGET (canvas), (GdkEvent *) &ex); -- gdk_region_destroy (ex.region); -+ art_irect_intersect (&clipped, &visible_rect, rects + i); -+ if (!art_irect_empty (&clipped)) { -+ GdkRectangle gdkrect; -+ -+ gdkrect.x = clipped.x0; -+ gdkrect.y = clipped.y0; -+ gdkrect.width = clipped.x1 - clipped.x0; -+ gdkrect.height = clipped.y1 - clipped.y0; -+ -+ gdk_region_union_with_rect (region, &gdkrect); - } - } - - art_free (rects); - -+ /* Expose! */ -+ -+ gdk_region_get_clipbox (region, ®ion_area); -+ -+ expose_event.type = GDK_EXPOSE; -+ expose_event.window = canvas->layout.bin_window; -+ expose_event.send_event = TRUE; -+ expose_event.area.x = region_area.x; -+ expose_event.area.y = region_area.y; -+ expose_event.area.width = region_area.width; -+ expose_event.area.height = region_area.height; -+ expose_event.region = region; -+ expose_event.count = 0; -+ -+ gdk_window_begin_paint_region (canvas->layout.bin_window, region); -+ gtk_widget_send_expose (GTK_WIDGET (canvas), (GdkEvent *) &expose_event); -+ gdk_window_end_paint (canvas->layout.bin_window); -+ -+ gdk_region_destroy (region); -+ - canvas->redraw_x1 = 0; - canvas->redraw_y1 = 0; - canvas->redraw_x2 = 0; diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 386281c..4156473 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,12 +7,10 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.20.1.1 -Release: 4%{?dist} +Version: 2.25.90 +Release: 1%{?dist} URL: http://www.gnome.org/ -Source0: http://download.gnome.org/sources/libgnomecanvas/2.20/%{name}-%{version}.tar.bz2 -Patch0: libgnomecanvas-2.19.2-avoid-tearing.patch -Patch1: zoom-redraw-fix.patch +Source0: http://download.gnome.org/sources/libgnomecanvas/2.25/%{name}-%{version}.tar.bz2 License: LGPLv2+ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -50,8 +48,6 @@ Tk canvas widget but has evolved quite a bit over time. %prep %setup -q -%patch0 -p1 -b .avoid-tearing -%patch1 -p1 -b .zoom-redraw-fix %build export CFLAGS=$(echo $RPM_OPT_FLAGS |sed -e 's/O2/O1/g') @@ -90,6 +86,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Tue Feb 3 2009 Matthias Clasen 2.25.90-1 +- Update to 2.25.90 + * Sun Nov 09 2008 Debarshi Ray 2.20.1.1-4 - Use 'Requires: libglade2 >= 2.6.3-2' to prevent unowned %%{_libdir}/libglade and %%{_libdir}/libglade/2.0. diff --git a/sources b/sources index 54eb999..8a45056 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -948ed771d2957d24a0c9a414e9581055 libgnomecanvas-2.20.1.1.tar.bz2 +77ddcff0018bf14469de2d49cb58f086 libgnomecanvas-2.25.90.tar.bz2 diff --git a/zoom-redraw-fix.patch b/zoom-redraw-fix.patch deleted file mode 100644 index fe109b5..0000000 --- a/zoom-redraw-fix.patch +++ /dev/null @@ -1,53 +0,0 @@ -2007-11-05 Federico Mena Quintero - - Fix these bugs: - http://bugzilla.gnome.org/show_bug.cgi?id=493808 - https://bugzilla.novell.com/show_bug.cgi?id=336941 - - * libgnomecanvas/gnome-canvas.c (paint): Oops, use the correct - visible rectangle; we forgot to take the zoom_{x,y}ofs into - account. Also, take those offsets into account when generating - the actual rectangle to be added to the GdkRegion. - -diff --git a/libgnomecanvas/gnome-canvas.c b/libgnomecanvas/gnome-canvas.c -index 5e89bc2..ca9769f 100644 ---- a/libgnomecanvas/gnome-canvas.c -+++ b/libgnomecanvas/gnome-canvas.c -@@ -3040,6 +3040,7 @@ gnome_canvas_expose (GtkWidget *widget, GdkEventExpose *event) - - if (canvas->need_update || canvas->need_redraw) { - ArtUta *uta; -+ - /* Update or drawing is scheduled, so just mark exposed area as dirty */ - uta = art_uta_from_irect (&rect); - gnome_canvas_request_redraw_uta (canvas, uta); -@@ -3082,8 +3083,8 @@ paint (GnomeCanvas *canvas) - - /* Turn those rectangles into a GdkRegion for exposing */ - -- visible_rect.x0 = canvas->layout.hadjustment->value; -- visible_rect.y0 = canvas->layout.vadjustment->value; -+ visible_rect.x0 = canvas->layout.hadjustment->value - canvas->zoom_xofs; -+ visible_rect.y0 = canvas->layout.vadjustment->value - canvas->zoom_yofs; - visible_rect.x1 = visible_rect.x0 + GTK_WIDGET (canvas)->allocation.width; - visible_rect.y1 = visible_rect.y0 + GTK_WIDGET (canvas)->allocation.height; - -@@ -3096,8 +3097,8 @@ paint (GnomeCanvas *canvas) - if (!art_irect_empty (&clipped)) { - GdkRectangle gdkrect; - -- gdkrect.x = clipped.x0; -- gdkrect.y = clipped.y0; -+ gdkrect.x = clipped.x0 + canvas->zoom_xofs; -+ gdkrect.y = clipped.y0 + canvas->zoom_yofs; - gdkrect.width = clipped.x1 - clipped.x0; - gdkrect.height = clipped.y1 - clipped.y0; - -@@ -3200,6 +3201,7 @@ idle_handler (gpointer data) - GDK_THREADS_ENTER (); - - canvas = GNOME_CANVAS (data); -+ - do_update (canvas); - - /* Reset idle id */ From 570a631d954f8ac805ecca69191ba13f26a96644 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 3 Feb 2009 16:47:00 +0000 Subject: [PATCH 53/97] br intltool --- libgnomecanvas.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 4156473..ce01548 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -8,7 +8,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.25.90 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.25/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -21,7 +21,7 @@ BuildRequires: libart_lgpl-devel >= %{libart_lgpl_version} BuildRequires: libglade2-devel >= %{libglade2_version} BuildRequires: gail-devel >= %{gail_version} BuildRequires: libtool gettext -BuildRequires: perl(XML::Parser) +BuildRequires: intltool %description The canvas widget allows you to create custom displays using stock items @@ -86,8 +86,10 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc/html/libgnomecanvas %changelog -* Tue Feb 3 2009 Matthias Clasen 2.25.90-1 +* Tue Feb 3 2009 Matthias Clasen 2.25.90-2 - Update to 2.25.90 +- Drop obsolete patches +- BR intltool * Sun Nov 09 2008 Debarshi Ray 2.20.1.1-4 - Use 'Requires: libglade2 >= 2.6.3-2' to prevent unowned From 7735019ea6e2ac7a193a3ac92718269125fa1bda Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 15:14:47 +0000 Subject: [PATCH 54/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index ce01548..ff601fb 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -8,7 +8,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.25.90 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.25/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -86,6 +86,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 2.25.90-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Feb 3 2009 Matthias Clasen 2.25.90-2 - Update to 2.25.90 - Drop obsolete patches From e867c2f3e0b3b9fd4be81bf77a3840a6000cfe61 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 17 Mar 2009 15:12:00 +0000 Subject: [PATCH 55/97] 2.26.0 --- .cvsignore | 2 +- libgnomecanvas.spec | 23 +++++++++++++---------- sources | 2 +- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.cvsignore b/.cvsignore index 55d8fea..4b08137 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgnomecanvas-2.25.90.tar.bz2 +libgnomecanvas-2.26.0.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index ff601fb..838ba9e 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,13 +7,13 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.25.90 -Release: 3%{?dist} +Version: 2.26.0 +Release: 1%{?dist} URL: http://www.gnome.org/ -Source0: http://download.gnome.org/sources/libgnomecanvas/2.25/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/libgnomecanvas/2.26/%{name}-%{version}.tar.bz2 License: LGPLv2+ -Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Group: System Environment/Libraries +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gtk2 >= %{gtk2_version} Requires: libglade2 >= 2.6.3-2 BuildRequires: gtk2-devel >= %{gtk2_version} @@ -24,8 +24,8 @@ BuildRequires: libtool gettext BuildRequires: intltool %description -The canvas widget allows you to create custom displays using stock items -such as circles, lines, text, and so on. It was originally a port of the +The canvas widget allows you to create custom displays using stock items +such as circles, lines, text, and so on. It was originally a port of the Tk canvas widget but has evolved quite a bit over time. %package devel @@ -37,13 +37,13 @@ Requires: gtk2-devel >= %{gtk2_version} Requires: libart_lgpl-devel >= %{libart_lgpl_version} Requires: libglade2-devel >= 2.6.3-2 Requires: pkgconfig -# for /usr/share/gtk-doc/html +# for /usr/share/gtk-doc/html Requires: gtk-doc %description devel -The canvas widget allows you to create custom displays using stock items -such as circles, lines, text, and so on. It was originally a port of the +The canvas widget allows you to create custom displays using stock items +such as circles, lines, text, and so on. It was originally a port of the Tk canvas widget but has evolved quite a bit over time. %prep @@ -86,6 +86,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Tue Mar 17 2009 Matthias Clasen 2.26.0-1 +- Update to 2.26.0 + * Wed Feb 25 2009 Fedora Release Engineering - 2.25.90-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 8a45056..f3b8551 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -77ddcff0018bf14469de2d49cb58f086 libgnomecanvas-2.25.90.tar.bz2 +9bbc635e5ae70e63af071af74ba7e72f libgnomecanvas-2.26.0.tar.bz2 From 823f6f544c4d6a069f0025a40cfa56d40dde41cd Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 05:46:20 +0000 Subject: [PATCH 56/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 838ba9e..975774b 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -8,7 +8,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.26.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.26/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -86,6 +86,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 2.26.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Mar 17 2009 Matthias Clasen 2.26.0-1 - Update to 2.26.0 From 8a33d3a8f77ec517b6727569d9252d4fa253b9d1 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:50:58 +0000 Subject: [PATCH 57/97] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 54e939a..ffcfc84 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: libgnomecanvas -# $Id: Makefile,v 1.1 2004/09/09 07:27:36 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 19:00:53 notting Exp $ NAME := libgnomecanvas SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 32ac89dd0b645498fa30a700e0bba0611f8afe51 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 14 Feb 2010 03:52:12 +0000 Subject: [PATCH 58/97] Make ld happy --- libgnomecanvas.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 975774b..68f8ca9 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -8,7 +8,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.26.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.26/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -22,6 +22,7 @@ BuildRequires: libglade2-devel >= %{libglade2_version} BuildRequires: gail-devel >= %{gail_version} BuildRequires: libtool gettext BuildRequires: intltool +BuildRequires: autoconf automake libtool %description The canvas widget allows you to create custom displays using stock items @@ -40,6 +41,8 @@ Requires: pkgconfig # for /usr/share/gtk-doc/html Requires: gtk-doc +Patch0: libgnomecanvas-libs.patch + %description devel The canvas widget allows you to create custom displays using stock items @@ -48,6 +51,9 @@ Tk canvas widget but has evolved quite a bit over time. %prep %setup -q +%patch0 -p1 -b .libs + +autoreconf -i -f %build export CFLAGS=$(echo $RPM_OPT_FLAGS |sed -e 's/O2/O1/g') @@ -86,6 +92,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Sat Feb 13 2010 Matthias Clasen 2.26.0-3 +- Add missing libs + * Fri Jul 24 2009 Fedora Release Engineering - 2.26.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From dc87c2dee1626fc55e8b1bed4fb484f4de0ac504 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 14 Feb 2010 03:55:39 +0000 Subject: [PATCH 59/97] forgotten patch --- libgnomecanvas-libs.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 libgnomecanvas-libs.patch diff --git a/libgnomecanvas-libs.patch b/libgnomecanvas-libs.patch new file mode 100644 index 0000000..6ef1794 --- /dev/null +++ b/libgnomecanvas-libs.patch @@ -0,0 +1,11 @@ +diff -up libgnomecanvas-2.26.0/configure.in.libs libgnomecanvas-2.26.0/configure.in +--- libgnomecanvas-2.26.0/configure.in.libs 2010-02-13 22:45:28.642364057 -0500 ++++ libgnomecanvas-2.26.0/configure.in 2010-02-13 22:48:05.209114546 -0500 +@@ -89,6 +89,7 @@ CANVAS_MODULES="dnl + pangoft2 >= pango_required_version" + PKG_PROG_PKG_CONFIG([0.18]) + PKG_CHECK_MODULES(LIBGNOMECANVAS, $CANVAS_MODULES) ++LIBGNOMECANVAS_LIBS="$LIBGNOMECANVAS_LIBS -lm" + + if test "$enable_maintainer_mode" = "yes"; then + LIBGNOMECANVAS_DEPRECATED_CFLAGS="-DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES" From 5d465b8e6ca138d5e0a5dfaec07436ff1d166982 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 14 Feb 2010 04:09:06 +0000 Subject: [PATCH 60/97] Make ld happy --- libgnomecanvas-libs.patch | 17 +++++++++-------- libgnomecanvas.spec | 3 --- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/libgnomecanvas-libs.patch b/libgnomecanvas-libs.patch index 6ef1794..c690d8d 100644 --- a/libgnomecanvas-libs.patch +++ b/libgnomecanvas-libs.patch @@ -1,11 +1,12 @@ -diff -up libgnomecanvas-2.26.0/configure.in.libs libgnomecanvas-2.26.0/configure.in ---- libgnomecanvas-2.26.0/configure.in.libs 2010-02-13 22:45:28.642364057 -0500 -+++ libgnomecanvas-2.26.0/configure.in 2010-02-13 22:48:05.209114546 -0500 -@@ -89,6 +89,7 @@ CANVAS_MODULES="dnl - pangoft2 >= pango_required_version" - PKG_PROG_PKG_CONFIG([0.18]) - PKG_CHECK_MODULES(LIBGNOMECANVAS, $CANVAS_MODULES) -+LIBGNOMECANVAS_LIBS="$LIBGNOMECANVAS_LIBS -lm" +diff -up libgnomecanvas-2.26.0/configure.libs libgnomecanvas-2.26.0/configure +--- libgnomecanvas-2.26.0/configure.libs 2010-02-13 23:05:13.777363452 -0500 ++++ libgnomecanvas-2.26.0/configure 2010-02-13 23:06:40.070111238 -0500 +@@ -23837,6 +23837,8 @@ $as_echo "yes" >&6; } + : + fi ++LIBGNOMECANVAS_LIBS="$LIBGNOMECANVAS_LIBS -lm" ++ if test "$enable_maintainer_mode" = "yes"; then LIBGNOMECANVAS_DEPRECATED_CFLAGS="-DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES" + diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 68f8ca9..d8cda5a 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -22,7 +22,6 @@ BuildRequires: libglade2-devel >= %{libglade2_version} BuildRequires: gail-devel >= %{gail_version} BuildRequires: libtool gettext BuildRequires: intltool -BuildRequires: autoconf automake libtool %description The canvas widget allows you to create custom displays using stock items @@ -53,8 +52,6 @@ Tk canvas widget but has evolved quite a bit over time. %setup -q %patch0 -p1 -b .libs -autoreconf -i -f - %build export CFLAGS=$(echo $RPM_OPT_FLAGS |sed -e 's/O2/O1/g') %configure --disable-gtk-doc From c20c4862a7dbd5f358dabc5f0530adaddfaaa169 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 31 Mar 2010 22:11:19 +0000 Subject: [PATCH 61/97] 2.30.0 --- .cvsignore | 2 +- libgnomecanvas.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4b08137..f44e5d4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgnomecanvas-2.26.0.tar.bz2 +libgnomecanvas-2.30.0.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index d8cda5a..fc41418 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,13 +7,12 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.26.0 -Release: 3%{?dist} +Version: 2.30.0 +Release: 1%{?dist} URL: http://www.gnome.org/ -Source0: http://download.gnome.org/sources/libgnomecanvas/2.26/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gtk2 >= %{gtk2_version} Requires: libglade2 >= 2.6.3-2 BuildRequires: gtk2-devel >= %{gtk2_version} @@ -89,6 +88,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Wed Mar 31 2010 Matthias Clasen 2.30.0-1 +- Update to 2.30.0 + * Sat Feb 13 2010 Matthias Clasen 2.26.0-3 - Add missing libs diff --git a/sources b/sources index f3b8551..08679c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9bbc635e5ae70e63af071af74ba7e72f libgnomecanvas-2.26.0.tar.bz2 +9a9a2c5bcb4656c5dee6169a1e9da41e libgnomecanvas-2.30.0.tar.bz2 From 3b7eb9b392f9393cdb513a47287f67d2986cf1d0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 31 Mar 2010 22:18:25 +0000 Subject: [PATCH 62/97] drop obsolete patch --- libgnomecanvas.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index fc41418..e54fcb3 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -39,8 +39,6 @@ Requires: pkgconfig # for /usr/share/gtk-doc/html Requires: gtk-doc -Patch0: libgnomecanvas-libs.patch - %description devel The canvas widget allows you to create custom displays using stock items @@ -49,7 +47,6 @@ Tk canvas widget but has evolved quite a bit over time. %prep %setup -q -%patch0 -p1 -b .libs %build export CFLAGS=$(echo $RPM_OPT_FLAGS |sed -e 's/O2/O1/g') From b79a596acc5b9cba18d6a5b5e2287890d62341b2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 31 Mar 2010 22:42:07 +0000 Subject: [PATCH 63/97] fix spec --- libgnomecanvas.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index e54fcb3..da28f7f 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -50,7 +50,7 @@ Tk canvas widget but has evolved quite a bit over time. %build export CFLAGS=$(echo $RPM_OPT_FLAGS |sed -e 's/O2/O1/g') -%configure --disable-gtk-doc +%configure --disable-gtk-doc --enable-glade export tagname=CC make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool From d7839109a9ae5cca065ff69e831ec6e4d0b32bd6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 1 Apr 2010 21:13:22 +0000 Subject: [PATCH 64/97] 2.30.1 --- .cvsignore | 2 +- libgnomecanvas.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index f44e5d4..4800a47 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgnomecanvas-2.30.0.tar.bz2 +libgnomecanvas-2.30.1.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index da28f7f..8cca9b3 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,7 +7,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.30.0 +Version: 2.30.1 Release: 1%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 @@ -85,6 +85,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Thu Apr 1 2010 Matthias Clasen 2.30.1-1 +- Update to 2.30.1 + * Wed Mar 31 2010 Matthias Clasen 2.30.0-1 - Update to 2.30.0 diff --git a/sources b/sources index 08679c1..02d4113 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9a9a2c5bcb4656c5dee6169a1e9da41e libgnomecanvas-2.30.0.tar.bz2 +362ab7b81024b3c3b4a712e7df01b169 libgnomecanvas-2.30.1.tar.bz2 From 4c4a0dbeb77b3914475f53f9ac158f8cf4f2b36e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 21:03:09 +0000 Subject: [PATCH 65/97] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index ffcfc84..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libgnomecanvas -# $Id: Makefile,v 1.2 2007/10/15 19:00:53 notting Exp $ -NAME := libgnomecanvas -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 21ae4003250595f23829d4bd5b0165d071d38f0d Mon Sep 17 00:00:00 2001 From: paragn Date: Wed, 29 Sep 2010 09:51:27 +0530 Subject: [PATCH 66/97] - Merge-review cleanup (#226012) --- libgnomecanvas.spec | 46 +++++++++++++++------------------------------ 1 file changed, 15 insertions(+), 31 deletions(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 8cca9b3..9b8efec 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -1,24 +1,17 @@ %define gettext_package libgnomecanvas-2.0 -%define gtk2_version 2.1.2 -%define libart_lgpl_version 2.3.8 -%define libglade2_version 2.0.1 -%define gail_version 1.9.0 - Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ Group: System Environment/Libraries -Requires: gtk2 >= %{gtk2_version} -Requires: libglade2 >= 2.6.3-2 -BuildRequires: gtk2-devel >= %{gtk2_version} -BuildRequires: libart_lgpl-devel >= %{libart_lgpl_version} -BuildRequires: libglade2-devel >= %{libglade2_version} -BuildRequires: gail-devel >= %{gail_version} +BuildRequires: gtk2-devel +BuildRequires: libart_lgpl-devel +BuildRequires: libglade2-devel +BuildRequires: gail-devel BuildRequires: libtool gettext BuildRequires: intltool @@ -30,17 +23,11 @@ Tk canvas widget but has evolved quite a bit over time. %package devel Summary: Libraries and headers for libgnomecanvas Group: Development/Libraries -Requires: %name = %{version}-%{release} -Conflicts: gnome-libs-devel < 1.4.1.2 -Requires: gtk2-devel >= %{gtk2_version} -Requires: libart_lgpl-devel >= %{libart_lgpl_version} -Requires: libglade2-devel >= 2.6.3-2 -Requires: pkgconfig +Requires: %{name} = %{version}-%{release} # for /usr/share/gtk-doc/html Requires: gtk-doc %description devel - The canvas widget allows you to create custom displays using stock items such as circles, lines, text, and so on. It was originally a port of the Tk canvas widget but has evolved quite a bit over time. @@ -49,24 +36,18 @@ Tk canvas widget but has evolved quite a bit over time. %setup -q %build -export CFLAGS=$(echo $RPM_OPT_FLAGS |sed -e 's/O2/O1/g') -%configure --disable-gtk-doc --enable-glade -export tagname=CC -make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool +%configure --disable-gtk-doc --enable-glade --disable-static +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +make %{?_smp_mflags} %install -rm -rf %{buildroot} -export tagname=CC -make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' -rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} -rm -f $RPM_BUILD_ROOT%{_libdir}/libglade/2.0/*.{a,la} %find_lang %{gettext_package} -%clean -rm -rf %{buildroot} - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -85,6 +66,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Thu Sep 23 2010 Parag Nemade 2.30.1-2 +- Merge-review cleanup (#226012) + * Thu Apr 1 2010 Matthias Clasen 2.30.1-1 - Update to 2.30.1 From e501e34c52df419eab0d1128dc54e8a4554f9e96 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 30 Sep 2010 09:28:30 -0400 Subject: [PATCH 67/97] 2.30.2 --- .gitignore | 1 + libgnomecanvas.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4800a47..7a9db64 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ libgnomecanvas-2.30.1.tar.bz2 +/libgnomecanvas-2.30.2.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 9b8efec..1373485 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -2,8 +2,8 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.30.1 -Release: 2%{?dist} +Version: 2.30.2 +Release: 1%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -66,6 +66,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Thu Sep 30 2010 Matthias Clasen 2.30.2-1 +- Update to 2.30.2 + * Thu Sep 23 2010 Parag Nemade 2.30.1-2 - Merge-review cleanup (#226012) diff --git a/sources b/sources index 02d4113..46c971b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -362ab7b81024b3c3b4a712e7df01b169 libgnomecanvas-2.30.1.tar.bz2 +7f7cb2348466616b034bd2265361455d libgnomecanvas-2.30.2.tar.bz2 From 4ddabc6bbc8408660a20a597ee357626aab5cc0d Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Wed, 2 Feb 2011 00:46:59 -0800 Subject: [PATCH 68/97] Update to 2.30.3 --- .gitignore | 1 + libgnomecanvas.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7a9db64..4c7a2b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ libgnomecanvas-2.30.1.tar.bz2 /libgnomecanvas-2.30.2.tar.bz2 +/libgnomecanvas-2.30.3.tar.bz2 diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 1373485..7e3254b 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -2,7 +2,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.30.2 +Version: 2.30.3 Release: 1%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 @@ -66,6 +66,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Wed Feb 2 2011 Christopher Aillon 2.30.3-1 +- Update to 2.30.3 + * Thu Sep 30 2010 Matthias Clasen 2.30.2-1 - Update to 2.30.2 diff --git a/sources b/sources index 46c971b..c176393 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f7cb2348466616b034bd2265361455d libgnomecanvas-2.30.2.tar.bz2 +ffcbb719c671ff5cd86e59aeba8d0b92 libgnomecanvas-2.30.3.tar.bz2 From e020805f825427552c9a67ce0117042ab630785d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 00:11:48 -0600 Subject: [PATCH 69/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 7e3254b..c2004ef 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,7 +3,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.3 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -66,6 +66,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 2.30.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Feb 2 2011 Christopher Aillon 2.30.3-1 - Update to 2.30.3 From 532cd2aa0965457e2c930d6fc041a4700a785374 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 7 Nov 2011 13:01:16 -0500 Subject: [PATCH 70/97] rebuild --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index c2004ef..cae5f2e 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,7 +3,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.3 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -66,6 +66,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Mon Nov 7 2011 Matthias Clasen - 2.30.3-3 +- Rebuild against new libpng + * Tue Feb 08 2011 Fedora Release Engineering - 2.30.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 31b218dba4ca811a30b376a2e2a022acd943fd35 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 01:46:13 -0600 Subject: [PATCH 71/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index cae5f2e..6b42a34 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,7 +3,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.3 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -66,6 +66,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 2.30.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Nov 7 2011 Matthias Clasen - 2.30.3-3 - Rebuild against new libpng From c839e77117964f9cb231ea5cc2bba94aa64888b0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 14:54:53 -0500 Subject: [PATCH 72/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 6b42a34..2c6d81c 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,7 +3,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.3 -Release: 4%{?dist} +Release: 5%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -66,6 +66,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 2.30.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Fedora Release Engineering - 2.30.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 97a346345c275376afc2c9a15f112fa4ab81f918 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 22:26:04 -0600 Subject: [PATCH 73/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 2c6d81c..f099fb2 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,7 +3,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.3 -Release: 5%{?dist} +Release: 6%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -66,6 +66,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 2.30.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Jul 19 2012 Fedora Release Engineering - 2.30.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 92c98dd1fbb61c5f626a263f98b26e5a6e537d48 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 00:37:05 -0500 Subject: [PATCH 74/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index f099fb2..faa517e 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,7 +3,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.3 -Release: 6%{?dist} +Release: 7%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -66,6 +66,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 2.30.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Feb 14 2013 Fedora Release Engineering - 2.30.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 1c8107fda4343940518f0dd74373eb8fd60fe399 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 22:33:47 -0500 Subject: [PATCH 75/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index faa517e..c0073f3 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,7 +3,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.3 -Release: 7%{?dist} +Release: 8%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -66,6 +66,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 2.30.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Aug 03 2013 Fedora Release Engineering - 2.30.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From b81d8f6999f5cfec3fade5d29eb07e08b99e7aed Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 03:33:59 +0000 Subject: [PATCH 76/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index c0073f3..e5765f5 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,7 +3,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.3 -Release: 8%{?dist} +Release: 9%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -66,6 +66,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 2.30.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 2.30.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 86bc69938fa496e7f6a7a8be4b588e90a8eb6cd0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 15:22:22 +0000 Subject: [PATCH 77/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index e5765f5..c35856b 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,7 +3,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.3 -Release: 9%{?dist} +Release: 10%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -66,6 +66,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 2.30.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun Aug 17 2014 Fedora Release Engineering - 2.30.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 7c9c7b355138ee7b7fe5a0b9a091d30b8d32620a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 03:14:33 +0000 Subject: [PATCH 78/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index c35856b..7a9f041 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,7 +3,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.3 -Release: 10%{?dist} +Release: 11%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -66,6 +66,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 2.30.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 2.30.3-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 3691a95fda4cea610c82502cca04fa10fe03fd3d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 18:44:24 +0000 Subject: [PATCH 79/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 7a9f041..621f9ca 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,7 +3,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.3 -Release: 11%{?dist} +Release: 12%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -66,6 +66,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.30.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Feb 04 2016 Fedora Release Engineering - 2.30.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 39a76efe93157c66e0a358f1d59eaae5b2448b3f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 18:56:05 +0000 Subject: [PATCH 80/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 621f9ca..688f4ea 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,7 +3,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.3 -Release: 12%{?dist} +Release: 13%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -66,6 +66,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.30.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 2.30.3-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From d843e14babdfaeee59d91b8b5012237c06363ca1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 01:32:38 +0000 Subject: [PATCH 81/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 688f4ea..20ce4ab 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,7 +3,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.3 -Release: 13%{?dist} +Release: 14%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -66,6 +66,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 2.30.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 2.30.3-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 958cf1151dff8633045f44895e2a2332cd1be7bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 21:44:42 +0000 Subject: [PATCH 82/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 20ce4ab..8f1b0d8 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,7 +3,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.3 -Release: 14%{?dist} +Release: 15%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -66,6 +66,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.30.3-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 2.30.3-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 5b90bf807da053135ff8ecaf0e559544d2dd6b73 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:40:11 -0500 Subject: [PATCH 83/97] Remove needless use of %defattr --- libgnomecanvas.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 8f1b0d8..c821ebd 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -53,13 +53,11 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %postun -p /sbin/ldconfig %files -f %{gettext_package}.lang -%defattr(-,root,root) %doc COPYING.LIB AUTHORS NEWS README %{_libdir}/lib*.so.* %{_libdir}/libglade/2.0/libcanvas.so %files devel -%defattr(-,root,root) %{_libdir}/lib*.so %{_libdir}/pkgconfig/* %{_includedir}/* From e203b25e11b7584929d98b1a9dff7e13945f8862 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 08:10:46 +0000 Subject: [PATCH 84/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index c821ebd..a4c6592 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,7 +3,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.3 -Release: 15%{?dist} +Release: 16%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -64,6 +64,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 2.30.3-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 2.30.3-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 47801143e583ed991d531afd0fd01ac992cb08a5 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:39:45 +0100 Subject: [PATCH 85/97] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- libgnomecanvas.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index a4c6592..5bb760e 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -48,9 +48,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %find_lang %{gettext_package} -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files -f %{gettext_package}.lang %doc COPYING.LIB AUTHORS NEWS README From 55f574245956aaeebf6ff2bed14cd642d8fe6b8f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:51 +0100 Subject: [PATCH 86/97] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- libgnomecanvas.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 5bb760e..a6167dd 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -7,7 +7,6 @@ Release: 16%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ -Group: System Environment/Libraries BuildRequires: gtk2-devel BuildRequires: libart_lgpl-devel BuildRequires: libglade2-devel @@ -22,7 +21,6 @@ Tk canvas widget but has evolved quite a bit over time. %package devel Summary: Libraries and headers for libgnomecanvas -Group: Development/Libraries Requires: %{name} = %{version}-%{release} # for /usr/share/gtk-doc/html Requires: gtk-doc From bf2fd826202b113c53d4658bf56a405ce6e7586c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 07:14:58 +0000 Subject: [PATCH 87/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index a6167dd..28e273f 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,7 +3,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.3 -Release: 16%{?dist} +Release: 17%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -60,6 +60,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 2.30.3-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 2.30.3-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From d182ebf54f504643f76786f5d317fe48746ca4a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 13:23:11 +0000 Subject: [PATCH 88/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 28e273f..4ce1937 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,7 +3,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.3 -Release: 17%{?dist} +Release: 18%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -60,6 +60,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.30.3-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 2.30.3-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From a000fc50f82a8d69c5c919ee5d3e3f38e2e7cac5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 09:16:06 +0000 Subject: [PATCH 89/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 4ce1937..1409e0f 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,7 +3,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.3 -Release: 18%{?dist} +Release: 19%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -60,6 +60,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 2.30.3-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 2.30.3-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 03ad221ada70a66ced4dbe5d582dc08604cd29cf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 04:45:22 +0000 Subject: [PATCH 90/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 1409e0f..47c294c 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,7 +3,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.3 -Release: 19%{?dist} +Release: 20%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -60,6 +60,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.30.3-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 2.30.3-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From a96fcfe39e00315ec44157e67fbd1d1f5df4d9ba Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 5 Jan 2021 01:54:22 +0000 Subject: [PATCH 91/97] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- libgnomecanvas.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 47c294c..e075907 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -13,6 +13,7 @@ BuildRequires: libglade2-devel BuildRequires: gail-devel BuildRequires: libtool gettext BuildRequires: intltool +BuildRequires: make %description The canvas widget allows you to create custom displays using stock items From 6d933c9f51514f01e410a39ad64ce37b0c0c9962 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 17:10:19 +0000 Subject: [PATCH 92/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index e075907..7c0f0d3 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,7 +3,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.3 -Release: 20%{?dist} +Release: 21%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -61,6 +61,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.30.3-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 2.30.3-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 581232181e296b5d62df657094ff33da0a44b669 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 11:29:21 +0000 Subject: [PATCH 93/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 7c0f0d3..b8e1d28 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,7 +3,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.3 -Release: 21%{?dist} +Release: 22%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -61,6 +61,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.30.3-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 2.30.3-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From d1df4a87b1ef0f9a41f48e5fe42d2da83bd977b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 16:19:55 +0000 Subject: [PATCH 94/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index b8e1d28..3a54945 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,7 +3,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.3 -Release: 22%{?dist} +Release: 23%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -61,6 +61,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.30.3-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 2.30.3-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 93d675fbd878b8443511399d4508d37b9b866ef4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 17:56:13 +0000 Subject: [PATCH 95/97] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 3a54945..82b2f74 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,7 +3,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.3 -Release: 23%{?dist} +Release: 24%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -61,6 +61,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2.30.3-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 2.30.3-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From be6d6b107fa045cf141c4f52fec9a7a1b1f539a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 16:27:32 +0000 Subject: [PATCH 96/97] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libgnomecanvas.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 82b2f74..c6d977f 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -3,7 +3,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.30.3 -Release: 24%{?dist} +Release: 25%{?dist} URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ @@ -61,6 +61,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.30.3-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 2.30.3-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From a596fdc014ee516b30209898078bea8b8b0e8dd9 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 23:06:18 +0300 Subject: [PATCH 97/97] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index c176393..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -ffcbb719c671ff5cd86e59aeba8d0b92 libgnomecanvas-2.30.3.tar.bz2