Author: freetz Date: Tue Sep 6 18:56:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged from DEVEL and updated to 2.12.0
---- Files affected: SPECS: gnome-utils.spec (1.126 -> 1.127) ---- Diffs: ================================================================ Index: SPECS/gnome-utils.spec diff -u SPECS/gnome-utils.spec:1.126 SPECS/gnome-utils.spec:1.127 --- SPECS/gnome-utils.spec:1.126 Sun Sep 4 18:34:34 2005 +++ SPECS/gnome-utils.spec Tue Sep 6 20:56:32 2005 @@ -6,16 +6,15 @@ Summary(uk): őÔÉĚŚÔÉ GNOME, ÔÁËŚ ŃË ĐĎŰŐË ĆÁĘĚŚ× ÔÁ ËÁĚŘËŐĚŃÔĎŇ Summary(zh_CN): GNOMEÓŚÓĂłĚĐňźŻ Name: gnome-utils -Version: 2.10.1 -Release: 4 +Version: 2.12.0 +Release: 1 Epoch: 1 License: GPL v2 Group: X11/Applications -Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-utils/2.10/%{name}-%{version}.tar.bz2 -# Source0-md5: 78c0afdc112757b13d203fe1ad9c04ad +Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-utils/2.12/%{name}-%{version}.tar.bz2 +# Source0-md5: 950148f8d30f23185fc3910b2b45d978 Patch0: %{name}-desktop.patch Patch1: %{name}-omf.patch -Patch2: %{name}-hal.patch Icon: gnome-utils.xpm URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.10.0 @@ -155,10 +154,9 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build -cp /usr/share/gnome-common/data/omf.make . +%{__gnome_doc_common} %{__libtoolize} %{__aclocal} %{__autoconf} @@ -174,9 +172,6 @@ DESTDIR=$RPM_BUILD_ROOT \ GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -mv ChangeLog main-ChangeLog -find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh - rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no %find_lang %{name}-2.0 @@ -241,13 +236,14 @@ %files -f %{name}-2.0.lang %defattr(644,root,root,755) -%doc AUTHORS *ChangeLog NEWS README +%doc AUTHORS ChangeLog NEWS README %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/glade %dir %{_omf_dest_dir}/%{name} %files dict -f gnome-dictionary.lang %defattr(644,root,root,755) +%doc gdictsrc/ChangeLog gdictsrc/README %attr(755,root,root) %{_bindir}/gnome-dictionary %attr(755,root,root) %{_libdir}/gdict-applet %{_sysconfdir}/gconf/schemas/gdict.schemas @@ -261,6 +257,7 @@ %files floppy -f gfloppy.lang %defattr(644,root,root,755) +%doc gfloppy/AUTHORS gfloppy/ChangeLog gfloppy/NEWS gfloppy/README gfloppy/TODO %attr(755,root,root) %{_bindir}/gfloppy %{_sysconfdir}/gconf/schemas/gfloppy.schemas %{_desktopdir}/gfloppy.desktop @@ -268,10 +265,12 @@ %{_mandir}/man1/gfloppy* %{_omf_dest_dir}/%{name}/gfloppy-C.omf %lang(ja) %{_omf_dest_dir}/%{name}/gfloppy-ja.omf +%lang(nl) %{_omf_dest_dir}/%{name}/gfloppy-nl.omf %lang(uk) %{_omf_dest_dir}/%{name}/gfloppy-uk.omf %files logview -f gnome-system-log.lang %defattr(644,root,root,755) +%doc logview/ChangeLog logview/TODO %attr(755,root,root) %{_bindir}/gnome-system-log %{_sysconfdir}/gconf/schemas/logview.schemas %{_desktopdir}/gnome-system-log.desktop @@ -291,12 +290,14 @@ %files search-tool -f gnome-search-tool.lang %defattr(644,root,root,755) +%doc gsearchtool/AUTHORS gsearchtool/ChangeLog %attr(755,root,root) %{_bindir}/gnome-search-tool %{_sysconfdir}/gconf/schemas/gnome-search-tool.schemas %{_desktopdir}/gnome-search-tool.desktop %{_datadir}/%{name} %{_mandir}/man1/gnome-search-tool* %{_omf_dest_dir}/%{name}/gnome-search-tool-C.omf +%{_pixmapsdir}/gsearchtool %lang(es) %{_omf_dest_dir}/%{name}/gnome-search-tool-es.omf %lang(fr) %{_omf_dest_dir}/%{name}/gnome-search-tool-fr.omf %lang(it) %{_omf_dest_dir}/%{name}/gnome-search-tool-it.omf @@ -310,6 +311,7 @@ %files screenshot %defattr(644,root,root,755) +%doc gnome-screenshot/ChangeLog %attr(755,root,root) %{_bindir}/gnome-panel-screenshot %attr(755,root,root) %{_bindir}/gnome-screenshot %{_sysconfdir}/gconf/schemas/gnome-screenshot.schemas @@ -321,500 +323,20 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.126 2005/09/04 16:34:34 arekm -- rel 4; port to new hal api - -Revision 1.125 2005/09/04 15:26:12 arekm -- rel 3 - -Revision 1.124 2005/05/29 17:19:08 paladine -- wrrr, typo in gconf's schema filename, rel. 2 - -Revision 1.123 2005/04/14 08:28:54 paladine -- more %%find_lang's less %%files (thx qboosh) - -Revision 1.122 2005/04/14 07:14:40 qboosh -- unified - -Revision 1.121 2005/04/13 21:53:22 paladine -- updated to 2.10.1 -- splited into subpackages -- new style macros - -Revision 1.120 2005/03/10 11:37:49 paladine -- merged from DEVEL - -Revision 1.119.2.6 2005/03/07 22:19:51 wiget -- updated to 2.10.0 - -Revision 1.119.2.5 2005/02/28 00:46:45 paladine -- updated to 2.9.92 -- missing BR/R - -Revision 1.119.2.4 2005/02/10 21:39:27 paladine -- proper license - -Revision 1.119.2.3 2005/02/10 21:07:52 paladine -- disable scrollkeeper-install in install time, BR: gnome-common-2.8.0-2 -- small cleanup - -Revision 1.119.2.2 2005/02/08 21:09:54 grzegol -- updated to 2.9.91 - -Revision 1.119.2.1 2005/02/07 20:19:22 grzegol -- updated to 2.9.90 - -Revision 1.119 2004/10/12 10:25:24 aflinta -- up to version 2.8.1 - -Revision 1.118 2004/09/13 11:41:44 grzegol -- merged from DEVEL and updated to 2.8.0 -- removed locale-names patch -- remove no locale in %%install -- added omf patch (fix gfloppy-ja.omf file) - -Revision 1.117 2004/08/24 00:21:06 havner -- desktop patch -- rel 2 - -Revision 1.116.2.4 2004/08/30 12:49:34 grzegol -- updated to 2.7.91 - -Revision 1.116.2.3 2004/08/24 22:08:22 grzegol -- added desktop patch from HEAD -- rel. 2 - -Revision 1.116.2.2 2004/08/03 16:39:44 grzegol -- updated to 2.7.90 -- removed outdated kdev_t patch - -Revision 1.116.2.1 2004/07/01 16:04:18 grzegol -- updated to 2.7.0 - -Revision 1.116 2004/04/30 12:01:13 grzegol -- updated to 2.6.2 - -Revision 1.115 2004/04/20 13:39:26 grzegol -- added epoch to libglade2-devel BR - -Revision 1.114 2004/04/20 13:30:21 aflinta -- up to version 2.6.1 - -Revision 1.113 2004/03/22 17:16:32 aflinta -- merged from DEVEL, up to version 2.6.0 - -Revision 1.112.2.5 2004/03/09 11:27:06 grzegol -- regenerate also lt/al/am -- updated BRs and sorted Rs - -Revision 1.112.2.4 2004/03/09 10:31:52 aflinta -- up to version 2.5.90, added locale-names patch - -Revision 1.112.2.3 2004/01/13 21:53:58 grzegol -- updated to 2.5.2 - -Revision 1.112.2.2 2003/12/31 12:06:20 trojan -- updated to 2.5.1 -- added kdev_t patch (fix missing include) - -Revision 1.112.2.1 2003/12/16 12:58:48 trojan -- updated to 2.5.0 - -Revision 1.112 2003/10/21 15:43:18 freetz -- 2.4.1 - -Revision 1.111 2003/09/13 20:09:37 krzak -- fixes perm. for gdict-applet -- rel. 2 - -Revision 1.110 2003/09/08 19:01:24 grzegol -- updated to 2.4.0 - -Revision 1.109 2003/09/02 17:04:41 grzegol -- updated to 2.3.90 - -Revision 1.108 2003/08/07 20:58:36 aflinta -- version 2.3.4 - -Revision 1.107 2003/08/01 11:58:49 grzegol -- rel++ to rebuild without linc -- sorting/cosmetics - -Revision 1.106 2003/07/07 13:03:15 qboosh -- use _desktopdir macro, other minor changes where needed - -Revision 1.105 2003/06/01 10:50:36 aflinta -- wrrr, missing md5sum - -Revision 1.104 2003/06/01 10:31:59 aflinta -- just commit again to force distfiles to fetch sources - -Revision 1.103 2003/06/01 08:14:18 aflinta -- version 2.3.3 - -Revision 1.102 2003/05/25 05:48:13 misi3k -- massive attack s/pld.org.pl/pld-linux.org/ - -Revision 1.101 2003/05/19 13:27:10 aflinta -- version 2.3.2.1 - -Revision 1.100 2003/05/18 09:23:10 aflinta -- version 2.3.2 - -Revision 1.99 2003/05/09 09:07:09 aflinta -- cleanups - -Revision 1.98 2003/05/09 09:02:40 aflinta -- updated BR just to force new packages - -Revision 1.97 2003/05/09 08:57:35 trojan -- updated to 2.3.1 - -Revision 1.96 2003/05/03 15:17:32 aflinta -- disabled schema installation during package build - -Revision 1.95 2003/03/25 20:59:23 aflinta -- updated to version 2.3.0 - -Revision 1.94 2003/03/13 12:28:04 aflinta -- updated to version 2.2.1 - -Revision 1.93 2003/01/27 13:46:08 aflinta -- updated to version 2.2.0.3 - -Revision 1.92 2003/01/26 21:03:28 aflinta -- updated to version 2.2.0.2 - -Revision 1.91 2003/01/20 23:44:49 aflinta -- updated to version 2.2.0 - -Revision 1.90 2003/01/06 18:02:54 aflinta -- updated to version 2.1.90 - -Revision 1.89 2002/12/16 07:21:31 aflinta -- updated to version 2.1.5 - -Revision 1.88 2002/12/09 16:07:11 aflinta -- updated to version 2.1.4 - -Revision 1.87 2002/12/04 23:50:46 aflinta -- moved from /usr/X11R6 to /usr, release 4 - -Revision 1.86 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.85 2002/11/28 13:53:28 wrobell -- massive attack: s/_serverdir/_bonobo_server_dir/cg - -Revision 1.84 2002/11/27 11:54:36 aflinta -- updated server file location -- release 2 - -Revision 1.83 2002/11/25 20:35:02 wrobell -- _omf_dest_dir is defined in rpm package macros - -Revision 1.82 2002/11/25 20:14:34 wrobell -- use gconf_schema_install macro - -Revision 1.81 2002/11/25 20:04:48 aflinta -- updated to version 2.1.3 - -Revision 1.80 2002/11/03 21:17:41 aflinta -- updated to version 2.1.2 - -Revision 1.79 2002/10/29 18:54:31 aflinta -- rebuild against bonobo-activation 2.1.0, release up - -Revision 1.78 2002/10/24 22:04:25 malekith -- release 2 - -Revision 1.77 2002/10/21 21:08:34 aflinta -- removed obsoleted patches -- spec simplified - -Revision 1.76 2002/10/21 14:46:35 malekith -- removed obsolete sed hack - -Revision 1.75 2002/10/21 11:37:18 aflinta -- Merged from DEVEL - -Revision 1.69.2.14 2002/10/15 20:35:03 aflinta -- updated to version 2.1.1 - -Revision 1.69.2.13 2002/10/02 13:09:44 aflinta -- updated to version 2.1.0 - -Revision 1.69.2.12 2002/09/05 00:52:35 aflinta -- updated to version 2.0.5 - -Revision 1.69.2.11 2002/08/29 12:55:09 kura -- release 2 - -Revision 1.69.2.10 2002/08/29 12:11:08 aflinta -- updated BR - -Revision 1.69.2.9 2002/08/28 14:46:51 kura -- updated to 2.0.4 - -Revision 1.69.2.8 2002/08/25 19:16:13 aflinta -- updated to version 2.0.3 - -Revision 1.69.2.7 2002/08/16 18:54:30 aflinta -- updated BR -- changed source patch for easier future upgrades ;) - -Revision 1.69.2.6 2002/08/16 15:21:17 wolf -- remove dtd fix - -Revision 1.69.2.5 2002/08/16 13:36:29 wolf -- 2.0.2 -- gconf, dtd fixes - -Revision 1.69.2.4 2002/06/17 18:45:11 aflinta -- fix build (ChangeLog shouldn't be moved to itself) - -Revision 1.69.2.3 2002/06/17 17:16:58 wiget -updated to 2.0.0 - -Revision 1.69.2.2 2002/06/12 14:50:17 wiget -updated to 1.109.0 - -Revision 1.69.2.1 2002/05/23 15:30:33 wiget -updated to 1.106.0 for GNOME2 - -Revision 1.69 2002/05/22 05:46:29 kloczek -- merged translations from KSI, Kondara and TurboLinux. - -Revision 1.68 2002/05/22 05:41:29 kloczek -- release 3, -- rebuild against >= guile 1.4.1 and use new %doc packing infrastructure. - -Revision 1.67 2002/05/21 23:13:18 kloczek -perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \ - s/^automake -a -c -f/\%\{__automake\}/; \ - s/^autoconf/\%\{__autoconf\}/" - -Revision 1.66 2002/05/17 14:17:30 kloczek -- release 2: fixed omf files install path. - -Revision 1.65 2002/04/25 16:27:12 arturs -fixed a small typo - -Revision 1.64 2002/04/16 13:41:47 trojan -- BR: s/jade/openjade - -Revision 1.63 2002/03/24 23:28:18 kloczek -- perl -pi -e "s/^automake -a -c$/automake -a -c -f/" - -Revision 1.62 2002/03/14 12:17:15 misiek -- use with-messages - -Revision 1.61 2002/02/22 23:28:59 kloczek -- removed all Group fields translations (our rpm now can handle translating - Group field using gettext). - -Revision 1.60 2002/02/05 14:34:15 kloczek -- updated to 1.4.1.2 (bugfix release). - -Revision 1.59 2002/02/03 20:49:16 ankry -- adding es/pt/pt_BR Group translations - -Revision 1.58 2002/01/28 04:50:48 kloczek -- fixed files listed twice in %files. - -Revision 1.57 2002/01/28 04:25:30 kloczek -- updated to 1.4.1.1 (bugfix release), -- updated %files list and patches. - -Revision 1.56 2002/01/18 02:13:08 kloczek -perl -pi -e "s/[EMAIL PROTECTED]/[EMAIL PROTECTED]/" - -Revision 1.55 2001/11/25 00:58:43 qrczak -- gnome-utils-am_conditional.patch: fix automake madness -- gnome-utils-defs.patch: set Makefile variables in another way -- gnome-utils-glade_cflags.patch: add forgotten include paths - -Revision 1.54 2001/07/23 05:31:47 kloczek -- updated to 1.4.0.2, -- updated %files list. - -Revision 1.53 2001/06/24 21:27:13 kloczek -- updated to 1.4.0.1, -- added correct scrrollkeeper support, -- remove idl fiels form %files list, -- removed gettext-devel from BuildRequires (current version do not requires - correcting po/Makefile.in.in file for DESTDIR install), -- removed obsoleted patches. - -Revision 1.52 2001/06/15 15:57:00 baggins -- commented out gettextizing gfloppy (it doesn't work anyway) - -Revision 1.51 2001/04/24 18:30:43 kloczek - -Revision 1.50 2001/04/24 16:42:01 blues -- gtt.desktop moved from Aplications to Utilities - -Revision 1.49 2001/04/24 03:12:10 kloczek -- added use_AM_GNU_GETTEXT patch. - -Revision 1.48 2001/04/14 12:37:08 kura -- updated to 1.4.0 -- added LIBS="-ltinfo" for make - -Revision 1.47 2001/03/19 18:23:35 misiek -1.4.0 - -Revision 1.46 2001/02/28 10:00:44 misiek -1.3.1. fixed %%files - -Revision 1.45 2001/02/02 17:50:34 kloczek -- perl -pi -e "s/^\%\{_datadir\}\/pixmaps/\%\{_pixmapsdir\}/" - -Revision 1.44 2000/11/01 07:38:34 kloczek -- release 7, Epoch 1 (for allow upgrade from RH 7), -- added errordialog and nomailx patches, -- rebuild against gnome-libs linked with db3. - -Revision 1.43 2000/09/30 21:31:29 kloczek -- release 6: adapterized. - -Revision 1.42 2000/07/29 16:39:16 kloczek -- spec adapterized. - -Revision 1.41 2000/07/28 13:57:31 zagrodzki -- release 5, built against libpng >= 1.0.8 - -Revision 1.40 2000/07/13 23:09:36 baggins -- release 4 -- rebuild with ncurses 5.1 - -Revision 1.39 2000/07/13 20:41:01 baggins -- release 3 - -Revision 1.38 2000/07/12 19:50:35 kloczek -- release 2, -- added missing gnome-core-devel to BuildRequires rules. - -Revision 1.37 2000/07/11 12:56:16 kloczek -- updated to 1.2.1. - -Revision 1.36 2000/06/12 10:00:08 kloczek -- added "Obsoletes; gnome-admin". - -Revision 1.35 2000/06/12 09:08:22 kloczek -- updated Source url, %files list and %install. - -Revision 1.34 2000/06/09 07:54:41 kloczek -- more %%{__make} macros. - -Revision 1.33 2000/06/09 07:22:52 kloczek -- added using %%{__make} macro. - -Revision 1.32 2000/05/26 01:13:32 bonkey -- upgraded to 1.2.0 - -Revision 1.31 2000/05/16 20:51:41 kloczek -- spec adapterized. - -Revision 1.30 2000/05/10 21:14:23 kloczek -- s/docbook-dtd/docbook-dsssl/. - -Revision 1.29 2000/05/10 21:13:07 kloczek -- added "BuildRequires: docbook-dtd". - -Revision 1.28 2000/05/10 19:55:10 kloczek -- added using --with-gnome --all-name in %%find_lang macro. - -Revision 1.27 2000/05/01 21:02:34 mkochano -- Removed 'BuildRequires: (XFree86|glib)-devel' from packages which have - 'BuildRequires: gtk+-devel'. They were redundant, beacuse 'gtk+-devel' says - what it needs using 'Requires'. BTW, awk rules :) - -Revision 1.26 2000/04/26 08:08:28 wiget -- buildrequires jade - -Revision 1.25 2000/04/26 07:59:25 wiget -- updated to 1.1.0 -- NFY (kloczek please finish) - -Revision 1.24 2000/04/01 11:14:40 zagrodzki -- changed all BuildRoot definitons -- removed all applnkdir defs -- changed some prereqs/requires -- removed duplicate empty lines - -Revision 1.23 2000/03/28 16:54:20 baggins -- translated kloczkish into english - -Revision 1.22 2000/03/27 01:32:33 kloczek -- release 2. - -Revision 1.21 2000/03/16 19:21:42 mkochano -- More 'BuilRequires'. - -Revision 1.20 2000/03/12 00:25:51 kloczek -- updated to 1.0.51, -- updated Source url, -- revisited patches and %files list. - -Revision 1.19 2000/01/29 15:26:51 kloczek -- relase 3, -- spec adapterized, -- new package icon, -- merged patches from rawhide, -- recompiled in new enviroment with libesd not depends on liasound. - -Revision 1.18 1999/11/17 00:11:47 kloczek -- release 2, -- build against ncurses 5.0. - -Revision 1.17 1999/09/30 19:51:55 kloczek -- added missing gstripchart.conf file. - -Revision 1.16 1999/09/30 13:03:10 kloczek -- fixes in %files in help file list. - -Revision 1.15 1999/09/30 12:57:10 kloczek -- updated to 1.0.50, -- added BuildRequires rules, -- more rpm macros, -- added detailed help file list with %lang() macros, -- added applnk patch for installing desktop files in applnk tree, -- added automake and gstripchart_help patches (just in time can be aplayed - to gnome tree) with fixing some bugs in Makefile.am files and with fix - installing gstripchart help files. - -Revision 1.14 1999/07/20 11:04:33 baggins -- fixed usage of macros -- added/removed neccesary/obsolete patches -- FHS 2.0 compliance where needed -- gzipping docs where needed - -Revision 1.13 1999/07/12 23:05:57 kloczek -- added using CVS keywords in %changelog (for automating them). +Revision 1.127 2005/09/06 18:56:32 freetz +- merged from DEVEL and updated to 2.12.0 -* Fri Sep 25 1998 Tomasz Kłoczko <[EMAIL PROTECTED]> - [0.30-1] -- added in Requires "gtk+ >= 1.1.2, glib >= 1.1.3", -- removed obsolete /usr/X11R6/share/go from main package. +Revision 1.124.2.5 2005/08/22 20:57:54 aflinta +- 2.11.92 -* Fri Sep 18 1998 Tomasz Kłoczko <[EMAIL PROTECTED]> - [0.28-2] <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-utils.spec?r1=1.126&r2=1.127&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
