SPECS: gnome-system-monitor.spec, gedit2.spec, eog.spec - merged f...

freetz freetz at pld-linux.org
Tue Sep 6 20:50:32 CEST 2005


Author: freetz                       Date: Tue Sep  6 18:50:32 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL and updated to 2.12.0

---- Files affected:
SPECS:
   gnome-system-monitor.spec (1.27 -> 1.28) , gedit2.spec (1.82 -> 1.83) , eog.spec (1.73 -> 1.74) 

---- Diffs:

================================================================
Index: SPECS/gnome-system-monitor.spec
diff -u SPECS/gnome-system-monitor.spec:1.27 SPECS/gnome-system-monitor.spec:1.28
--- SPECS/gnome-system-monitor.spec:1.27	Mon Apr 11 19:17:28 2005
+++ SPECS/gnome-system-monitor.spec	Tue Sep  6 20:50:27 2005
@@ -2,24 +2,24 @@
 Summary:	Simple process monitor
 Summary(pl):	Prosty monitor procesów
 Name:		gnome-system-monitor
-Version:	2.10.1
+Version:	2.12.0
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-system-monitor/2.10/%{name}-%{version}.tar.bz2
-# Source0-md5:	22acb1699193f8bd2ced656d44f57377
+Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-system-monitor/2.12/%{name}-%{version}.tar.bz2
+# Source0-md5:	6c92852b0fe228e5d8fb2309822035a7
 Patch0:		%{name}-desktop.patch
 URL:		http://www.gnome.org/
 BuildRequires:	GConf2-devel >= 2.10.0
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gnome-common >= 2.8.0-2
-BuildRequires:	gnome-vfs2-devel >= 2.10.0
-BuildRequires:	gtk+2-devel >= 2:2.6.2
-BuildRequires:	libgnomeui-devel >= 2.10.0
-BuildRequires:	libgtop-devel >= 1:2.10.0
+BuildRequires:	gnome-vfs2-devel >= 2.11.0
+BuildRequires:	gtk+2-devel >= 2:2.8.0
+BuildRequires:	libgnomeui-devel >= 2.11.1
+BuildRequires:	libgtop-devel >= 1:2.12.0
 BuildRequires:	libselinux-devel
-BuildRequires:	libwnck-devel >= 2.10.0
+BuildRequires:	libwnck-devel >= 2.11.91
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper
@@ -40,7 +40,7 @@
 %patch0 -p1
 
 %build
-cp /usr/share/gnome-common/data/omf.make .
+%{__gnome_doc_common}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
@@ -87,129 +87,26 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.27  2005/04/11 17:17:28  freetz
-- 2.10.1, new style macros
+Revision 1.28  2005/09/06 18:50:27  freetz
+- merged from DEVEL and updated to 2.12.0
 
-Revision 1.26  2005/03/08 09:15:22  paladine
-- libgnomesu is optional
+Revision 1.27.2.7  2005/08/22 20:50:52  aflinta
+- 2.11.92
 
-Revision 1.25  2005/03/08 08:27:11  paladine
-- merged from DEVEL
+Revision 1.27.2.6  2005/08/18 11:00:03  aflinta
+- rebuild with cairo, rel. 3
 
-Revision 1.24  2005/02/14 11:55:04  paladine
-- updated to 2.8.3
-- missing BR: pkgconfig
-- proper license
+Revision 1.27.2.5  2005/08/09 11:11:10  aflinta
+- if we rebuild with libwnck, we should require proper version
 
-Revision 1.23.2.4  2005/03/07 21:47:15  wiget
-- updated to 2.10.0
+Revision 1.27.2.4  2005/08/09 10:51:31  paladine
+- rel. 2 for rebuild with libwnck 2.11.91
 
-Revision 1.23.2.3  2005/03/01 19:59:44  aflinta
-- release 2 for rebuild with libwnck
+Revision 1.27.2.3  2005/08/08 13:42:27  paladine
+- updated to 2.11.91
 
-Revision 1.23.2.2  2005/02/28 14:50:28  paladine
-- updated to 2.9.92
-- proper license
+Revision 1.27.2.2  2005/07/25 22:09:42  freetz
+- 2.11.90
 
-Revision 1.23.2.1  2005/02/08 12:24:59  grzegol
-- updated to 2.9.91
-
-Revision 1.23  2004/12/06 19:19:54  grzegol
-- added BR: gnome-vfs2-devel
-
-Revision 1.22  2004/12/06 19:10:16  freetz
-- 2.8.1, STBR
-- disable scrollkeeper-install in install time, BR: gnome-common-2.8.0-2
-
-Revision 1.21  2004/10/17 15:34:50  freetz
-- 2.8.0, removed locale-names.patch
-
-Revision 1.20  2004/09/15 17:01:00  grzegol
-- merged 2.7.0 from DEVEL
-
-Revision 1.19  2004/08/24 12:08:18  freetz
-- added desktop patch, rel.2, STBR
-
-Revision 1.18.2.3  2004/08/30 19:02:18  aflinta
-- rebuild with libgtop 2.7.92
-
-Revision 1.18.2.2  2004/08/24 22:36:07  grzegol
-- added desktop patch from HEAD
-- rel. 2
-
-Revision 1.18.2.1  2004/07/19 14:06:53  grzegol
-- updated to 2.7.0
-
-Revision 1.18  2004/03/21 22:58:38  grzegol
-- merged for DEVEL (version 2.6.0)
-
-Revision 1.16.2.5  2004/03/21 19:11:03  grzegol
-- updated to 2.6.0
-
-Revision 1.16.2.4  2004/03/15 10:35:50  grzegol
-- updated to 2.5.4
-
-Revision 1.16.2.3  2004/02/15 21:25:54  grzegol
-- updated to 2.5.3
-- changed to http source
-- removed gtksnap patch (it wasn't applied anyway)
-- added locale-names patch (changes locale no -> nb)
-- regenerate al/ac/am
-
-Revision 1.16.2.2  2003/12/08 17:01:05  wiget
-- 2.5.2
-
-Revision 1.16.2.1  2003/11/12 23:32:08  wiget
-- updated to 2.5.0
-
-Revision 1.16  2003/11/11 01:12:29  ankry
-- caps unification
-
-Revision 1.15  2003/10/22 17:32:27  freetz
-- release 2 (for rebuild with new libgtop)
-
-Revision 1.14  2003/09/09 05:08:49  aflinta
-- version 2.4.0
-
-Revision 1.13  2003/08/25 07:51:21  trojan
-- updated to 2.3.1
-
-Revision 1.12  2003/08/13 13:34:00  grzegol
-- rel. 4 to rebuild with libgtop-2.0.3
-- added R(post): GConf2, scrollkeeper
-
-Revision 1.11  2003/08/01 11:58:49  grzegol
-- rel++ to rebuild without linc
-- sorting/cosmetics
-
-Revision 1.10  2003/07/07 13:03:15  qboosh
-- use _desktopdir macro, other minor changes where needed
-
-Revision 1.9  2003/05/26 16:25:03  malekith
-- massive attack: adding Source-md5
-
-Revision 1.8  2003/05/25 05:48:12  misi3k
-- massive attack s/pld.org.pl/pld-linux.org/
-
-Revision 1.7  2003/05/15 19:55:35  aflinta
-- rebuild with libgtop
-
-Revision 1.6  2003/03/26 15:56:35  grzegol
-- updated to 2.3.0
-
-Revision 1.5  2003/01/13 21:48:24  aflinta
-- updated to version 2.0.4
-
-Revision 1.4  2002/12/09 07:15:00  aflinta
-- more macros
-- updated BR
-- release 3
-
-Revision 1.3  2002/12/05 10:59:15  aflinta
-- moved from /usr/X11R6 to /usr, release 2
-
-Revision 1.2  2002/12/03 21:07:24  grzegol
-- updated to 2.0.3
-
-Revision 1.1  2002/10/06 17:20:38  grzegol
-- new
+Revision 1.27.2.1  2005/07/07 16:08:15  wiget
+- updated to 2.11.4

================================================================
Index: SPECS/gedit2.spec
diff -u SPECS/gedit2.spec:1.82 SPECS/gedit2.spec:1.83
--- SPECS/gedit2.spec:1.82	Mon Aug  8 23:56:16 2005
+++ SPECS/gedit2.spec	Tue Sep  6 20:50:27 2005
@@ -2,12 +2,12 @@
 Summary:	gEdit - small but powerful text editor for X Window
 Summary(pl):	gEdit - mały ale potężny edytor tekstu dla X Window
 Name:		gedit2
-Version:	2.10.5
+Version:	2.12.0
 Release:	1
 License:	GPL v2
 Group:		X11/Applications/Editors
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gedit/2.10/gedit-%{version}.tar.bz2
-# Source0-md5:	790f804d4754c382630ba70d8d264e18
+Source0:	http://ftp.gnome.org/pub/gnome/sources/gedit/2.12/gedit-%{version}.tar.bz2
+# Source0-md5:	fd4d4b56933a792b33b8ef575836d4b2
 Patch0:		%{name}-use_default_font.patch
 Patch1:		%{name}-desktop.patch
 URL:		http://gedit.sourceforge.net/
@@ -19,11 +19,11 @@
 BuildRequires:	eel-devel >= 2.10.0
 BuildRequires:	gettext-devel
 BuildRequires:	gnome-common >= 2.8.0-2
-BuildRequires:	gtksourceview-devel >= 1.2.0
+BuildRequires:	gtksourceview-devel >= 1.3.91
 BuildRequires:	intltool >= 0.33
 BuildRequires:	libglade2-devel >= 1:2.5.1
 BuildRequires:	libgnomeprintui-devel >= 2.10.2
-BuildRequires:	libgnomeui-devel >= 2.10.0-2
+BuildRequires:	libgnomeui-devel >= 2.11.2-2
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	popt-devel >= 1.5
@@ -123,7 +123,7 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README ChangeLog TODO AUTHORS THANKS
-%{_sysconfdir}/gconf/schemas/*
+%{_sysconfdir}/gconf/schemas/gedit.schemas
 %attr(755,root,root) %{_bindir}/*
 %dir %{_libdir}/gedit-2
 %dir %{_libdir}/gedit-2/plugins
@@ -148,502 +148,20 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.82  2005/08/08 21:56:16  freetz
-- 2.10.5
+Revision 1.83  2005/09/06 18:50:27  freetz
+- merged from DEVEL and updated to 2.12.0
 
-Revision 1.81  2005/08/04 16:43:45  paladine
-- updated to 2.10.4
-- removed outdated bug311187 patch
+Revision 1.81.2.5  2005/09/05 12:57:36  paladine
+- updated to 2.12.0
 
-Revision 1.80  2005/07/29 12:30:56  freetz
-- cleanup, patch solving http://bugzilla.gnome.org/show_bug.cgi?id=311187
-  added, rel.2
+Revision 1.81.2.4  2005/08/30 09:54:30  paladine
+- updated to 2.11.93 (bugfixes and translation updates)
 
-Revision 1.79  2005/06/18 20:00:10  saq
-- pythonprov reqs python and doesn't python-modules
+Revision 1.81.2.3  2005/08/23 12:00:48  aflinta
+- 2.11.92
 
-Revision 1.78  2005/06/08 18:34:17  paladine
-- updated to 2.10.3
+Revision 1.81.2.2  2005/08/18 21:12:39  aflinta
+- rebuild with cairo, rel. 2
 
-Revision 1.77  2005/06/01 19:20:37  zbyniu
-- BR: gettext-devel
-
-Revision 1.76  2005/04/12 19:23:21  freetz
-- reversed ldconfig changes
-
-Revision 1.75  2005/04/08 10:44:56  paladine
-- new style macros
-- STBR
-
-Revision 1.74  2005/04/06 11:18:31  paladine
-- missing umask 022
-
-Revision 1.73  2005/04/06 00:12:37  paladine
-- cosmetics
-
-Revision 1.72  2005/04/04 17:05:25  paladine
-- updated to 2.10.2
-- use new faster rpm's GConf automation
-- run scrollkeeper-update in quiet mode
-- don't package deprecated gnome-mime-data stuff
-
-Revision 1.71  2005/03/27 14:09:27  paladine
-- updated to 2.10.1
-
-Revision 1.70  2005/03/20 20:17:30  aflinta
-- rebuild with howl 0.9.10
-
-Revision 1.69  2005/03/14 12:00:58  paladine
-- merged from DEVEL
-- proper license
-
-Revision 1.68  2005/02/12 20:51:05  paladine
-- proper license
-
-Revision 1.67  2005/02/12 20:37:53  paladine
-- updated to 2.8.3, STBR
-
-Revision 1.66.2.3  2005/03/12 23:51:05  aflinta
-- up to version 2.10.0
-
-Revision 1.66.2.2  2005/03/01 12:41:26  aflinta
-- up to version 2.9.7
-
-Revision 1.66.2.1  2005/02/08 13:21:30  grzegol
-- updated to 2.9.6
-
-Revision 1.66  2005/01/05 22:41:18  havner
-- rel 2 for aspell 0.50 rebuild
-
-Revision 1.65  2004/12/06 18:38:56  freetz
-- added forgotten changelog entry
-
-Revision 1.64  2004/12/06 18:33:04  freetz
-- 2.8.2, STBR
-- disable scrollkeeper-install in install time, BR: gnome-common-2.8.0-2
-- removed po.patch (outdated)
-
-Revision 1.63  2004/11/17 11:27:28  paladine
-- added desktop patch
-- rel 2
-
-Revision 1.62  2004/10/10 18:21:05  paladine
-- updated to 2.8.1
-
-Revision 1.61  2004/09/15 18:24:37  grzegol
-- in gnome-common-2.8.0 all macros are in %%{_aclocaldir}, not in
-  %%{_aclocaldir}/gnome2-macros, so remove -I %%{_aclocal}/gnome2-macros from
-  %%{__aclocal} args and BR: gnome-common >= 2.8.0
-
-Revision 1.60  2004/09/13 12:55:58  grzegol
-- merged from DEVEL and updated to 2.8.0
-
-Revision 1.59  2004/08/04 06:23:49  ankry
-- i18n fixes (-po patch), rel. 2
-
-Revision 1.58.2.8  2004/08/30 19:00:28  grzegol
-- updated to 2.7.92
-- removed locale-names patch
-- remove no locale in %%install
-
-Revision 1.58.2.7  2004/08/22 20:20:53  aflinta
-- rebuild with howl, release 2
-
-Revision 1.58.2.6  2004/08/21 20:08:17  grzegol
-- BR: intltool >= 0.31
-
-Revision 1.58.2.5  2004/08/16 18:47:09  aflinta
-- up to version 2.7.91
-
-Revision 1.58.2.4  2004/08/04 16:40:57  grzegol
-- added -po patch from HEAD; rel. 2
-
-Revision 1.58.2.3  2004/08/01 18:40:45  grzegol
-- updated to 2.7.90
-- rebuild intltool
-
-Revision 1.58.2.2  2004/07/26 15:14:55  grzegol
-- typo
-
-Revision 1.58.2.1  2004/07/05 19:29:35  grzegol
-- updated to 2.7.1
-- added Requires to -devel subpackage
-
-Revision 1.58  2004/06/26 18:46:42  aflinta
-- up to version 2.6.2
-
-Revision 1.57  2004/05/03 19:40:26  grzegol
-- updated to 2.6.1
-
-Revision 1.56  2004/03/23 11:54:22  grzegol
-- merged from DEVEL and updated to 2.6.0
-
-Revision 1.55  2004/02/24 23:56:51  andree
-- cp config.sub, rel++
-
-Revision 1.54  2004/02/24 21:50:04  krzak
-- use_default_font.patch - use the system's default font for
-  editing text by default
-- rel 2.
-
-Revision 1.53.2.7  2004/03/16 18:50:11  grzegol
-- updated to 2.5.92
-
-Revision 1.53.2.6  2004/03/09 11:40:08  grzegol
-- added R(post): GConf2 and R(post,postun): /sbin/ldconfig
-
-Revision 1.53.2.5  2004/03/09 11:01:29  aflinta
-- up to version 2.5.91
-
-Revision 1.53.2.4  2004/02/24 19:07:15  grzegol
-- added am patch (fixes pixmaps/Makefile.am)
-- regenerate also lt/al/am
-- disabled schemas installation during build
-- added BR: ORBit2-devel, gnome-common, popt-devel
-- strict internal deps
-
-Revision 1.53.2.3  2004/02/24 15:14:13  aflinta
-- up to version 2.5.90
-
-Revision 1.53.2.2  2004/01/16 00:02:01  grzegol
-- updated to 2.5.3
-
-Revision 1.53.2.1  2003/11/25 15:38:26  wiget
-- 2.5.0
-
-Revision 1.53  2003/10/16 20:04:58  freetz
-- 2.4.1
-
-Revision 1.52  2003/09/09 19:17:48  aflinta
-- version 2.4.0
-
-Revision 1.51  2003/09/08 15:02:52  qwark
-- It needs 0.6.0 version of gtksourceview at least
-
-Revision 1.50  2003/08/27 14:32:46  aflinta
-- version 2.3.5
-
-Revision 1.49  2003/08/01 11:58:49  grzegol
-- rel++ to rebuild without linc
-- sorting/cosmetics
-
-Revision 1.48  2003/07/07 13:03:14  qboosh
-- use _desktopdir macro, other minor changes where needed
-
-Revision 1.47  2003/07/04 17:52:18  grzegol
-- Obsoletes gedit-plugins < 2.3.3-2
-
-Revision 1.46  2003/07/04 10:56:41  wiget
-- plugins are merged again
-
-Revision 1.45  2003/06/30 16:06:53  aflinta
-- version 2.3.3
-
-Revision 1.44  2003/05/26 10:05:27  trojan
-- updated to 2.3.2
-
-Revision 1.43  2003/05/25 05:47:47  misi3k
-- massive attack s/pld.org.pl/pld-linux.org/
-
-Revision 1.42  2003/05/07 22:04:07  aflinta
-- version 2.3.1
-
-Revision 1.41  2003/03/27 10:50:46  aflinta
-- update to version 2.3.0
-
-Revision 1.40  2003/03/12 14:30:32  aflinta
-- updated to version 2.2.1
-
-Revision 1.39  2003/02/28 23:37:08  pbern
-- fix BR
-
-Revision 1.38  2003/02/28 16:28:35  pbern
-- add BR
-
-Revision 1.37  2003/02/05 08:32:43  trojan
-- updated to 2.2.0.1
-
-Revision 1.36  2003/01/27 13:56:33  aflinta
-- updated to version 2.2.0
-
-Revision 1.35  2003/01/21 15:59:33  aflinta
-- updated to version 2.1.91
-
-Revision 1.34  2003/01/07 10:25:23  aflinta
- - updated to version 2.1.6
-
-Revision 1.33  2002/12/28 16:29:57  qboosh
-- don't force gzipped infos and mans, some other fixes/cosmetics where necessary
-
-Revision 1.32  2002/12/17 12:21:24  aflinta
-- updated to version 2.1.5
-
-Revision 1.31  2002/12/09 23:37:03  aflinta
-- updated to cersion 2.1.4
-
-Revision 1.30  2002/12/09 07:11:34  aflinta
-- updated BR
-- release 4
-
-Revision 1.29  2002/12/05 10:08:42  aflinta
-- moved from /usr/X11R6 to /usr, release 3
-
-Revision 1.28  2002/12/02 20:48:18  wolf
-- rpm-build >= 4.1-7 is reqired by %%gconf_schema_install
-
-Revision 1.27  2002/11/28 23:48:31  wrobell
-- massive attack: do not put bonobo servers into /usr/lib; remove
-  _bonobo_server_dir definition (bonobo-activation configuration
-  should be modified to look for servers in /usr and /usr/X11R6)
-
-Revision 1.26  2002/11/28 13:53:27  wrobell
-- massive attack: s/_serverdir/_bonobo_server_dir/cg
-
-Revision 1.25  2002/11/26 23:30:32  aflinta
-- updated to version 2.1.3
-
-Revision 1.24  2002/11/03 21:42:29  grzegol
-- updated to 2.1.2.1
-
-Revision 1.23  2002/10/29 18:54:31  aflinta
-- rebuild against bonobo-activation 2.1.0, release up
-
-Revision 1.22  2002/10/24 22:09:39  malekith
-- release 2
-
-Revision 1.21  2002/10/15 11:19:03  aflinta
-- updated to version 2.1.1
-
-Revision 1.20  2002/10/11 22:17:29  aflinta
-- added BR aspell-devel for building spell checker plugin
-
-Revision 1.19  2002/10/09 13:14:24  kloczek
-- use more macros, some cosmetics, added missing "rm -f missing" and use new %doc
-
-Revision 1.18  2002/10/03 15:46:41  aflinta
-- updated to version 2.1.0.1
-
-Revision 1.17  2002/09/05 13:20:21  aflinta
-- updated to version 2.0.5
-
-Revision 1.16  2002/08/29 17:02:38  aflinta
-- updated BR
-- release 2
-
-Revision 1.15  2002/08/29 12:50:09  kura
-- updated to 2.0.4
-
-Revision 1.14  2002/08/26 09:29:16  aflinta
-- updated to version 2.0.3
-
-Revision 1.13  2002/08/16 18:05:00  wolf
-- add scrollkeeper to %%post{,un}
-
-Revision 1.12  2002/08/16 17:23:55  wolf
-- gconf fix
-
-Revision 1.11  2002/08/16 12:10:22  michuz
-- updated %%files
-
-Revision 1.10  2002/08/16 11:54:32  michuz
-- updated %%doc
-
-Revision 1.9  2002/08/16 07:34:47  aflinta
-- updated to version 2.0.2
-
-Revision 1.8  2002/06/23 20:32:24  kloczek
-- perl -pi -e "s/^libtoolize --copy --force/\%\{__libtoolize\}/"
-
-Revision 1.7  2002/06/19 14:54:20  wiget
-updated to 2.0.0
-
-Revision 1.6  2002/06/12 10:39:44  wiget
-require newer GConf
-
-Revision 1.5  2002/06/12 07:39:20  wiget
-updated to 1.119.0
-
-Revision 1.4  2002/06/10 11:38:45  wiget
-- updated to 1.121.1
-
-Revision 1.3  2002/05/31 11:39:34  wiget
-- updated to 1.121.0
-- fixed source0 URL
-- strict BRs
-- fix %%{_sysconfdir} and omf support
-- call glib-gettextize not gettextize
-- register gconf schemas
-- finish %%file
-
-Revision 1.2  2002/05/24 15:58:23  ankry
-- fixed source URL
-
-Revision 1.1  2002/05/23 16:26:47  wiget
-from gedit.spec, updated to 1.120.0 but NFY because libgnomeprintui must be first
-
-Revision 1.55  2002/05/21 23:13:07  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
-             s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
-
-Revision 1.54  2002/04/25 16:21:48  arturs
-fixed a small typo
-
-Revision 1.53  2002/03/24 23:28:17  kloczek
-- perl -pi -e "s/^automake -a -c$/automake -a -c -f/"
-
-Revision 1.52  2002/02/22 23:28:56  kloczek
-- removed all Group fields translations (our rpm now can handle translating
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-system-monitor.spec?r1=1.27&r2=1.28&f=u
    http://cvs.pld-linux.org/SPECS/gedit2.spec?r1=1.82&r2=1.83&f=u
    http://cvs.pld-linux.org/SPECS/eog.spec?r1=1.73&r2=1.74&f=u




More information about the pld-cvs-commit mailing list