Author: aflinta Date: Tue Sep 6 10:05:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged from DEVEL, 2.12.0
---- Files affected: SPECS: GConf2.spec (1.92 -> 1.93) ---- Diffs: ================================================================ Index: SPECS/GConf2.spec diff -u SPECS/GConf2.spec:1.92 SPECS/GConf2.spec:1.93 --- SPECS/GConf2.spec:1.92 Thu Jul 7 13:30:34 2005 +++ SPECS/GConf2.spec Tue Sep 6 12:05:11 2005 @@ -1,5 +1,8 @@ # $Revision$, $Date$ # +# TODO: +# - install evoldap.scheme ? +# # Conditional build: %bcond_without static_libs # don't build static libraries # @@ -8,23 +11,23 @@ Summary(pt_BR): Sistema de Configuraçăo do GNOME 2 Summary(ru): óÉÓÔĹÍÁ ËĎÎĆÉÇŐŇÁĂÉÉ GNOME 2 Name: GConf2 -Version: 2.10.1 +Version: 2.12.0 Release: 1 License: LGPL Group: X11/Applications -Source0: http://ftp.gnome.org/pub/gnome/sources/GConf/2.10/GConf-%{version}.tar.bz2 -# Source0-md5: c411bd6e9e25362ea613bb9a084be904 +Source0: http://ftp.gnome.org/pub/gnome/sources/GConf/2.12/GConf-%{version}.tar.bz2 +# Source0-md5: e674d838922a9e9de0cee9fd2ef1ea0c Patch0: %{name}-NO_MAJOR_VERSION.patch Patch1: %{name}-path.patch URL: http://www.gnome.org/ -BuildRequires: ORBit2-devel >= 1:2.12.1 +BuildRequires: ORBit2-devel >= 1:2.12.3 BuildRequires: autoconf BuildRequires: automake >= 1:1.7 BuildRequires: gettext-devel -BuildRequires: gtk+2-devel >= 2:2.6.4 +BuildRequires: gtk+2-devel >= 2:2.8.3 BuildRequires: gtk-doc >= 1.3 BuildRequires: libtool -BuildRequires: libxml2-devel >= 1:2.6.19 +BuildRequires: libxml2-devel >= 1:2.6.21 BuildRequires: perl-base BuildRequires: pkgconfig BuildRequires: popt-devel @@ -53,9 +56,9 @@ Summary(pt_BR): Sistema de Configuraçăo do GNOME2 - arquivos para desenvolvimento Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: ORBit2-devel >= 1:2.12.1 +Requires: ORBit2-devel >= 1:2.12.3 Requires: gtk-doc-common -Requires: libxml2-devel >= 1:2.6.19 +Requires: libxml2-devel >= 1:2.6.21 Obsoletes: libGConf2-devel %description devel @@ -162,8 +165,23 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.92 2005/07/07 11:30:34 freetz -- 2.10.1, shutdown patch already included +Revision 1.93 2005/09/06 10:05:11 aflinta +- merged from DEVEL, 2.12.0 + +Revision 1.91.2.5 2005/08/22 17:18:53 aflinta +- version 2.11.92 + +Revision 1.91.2.4 2005/08/17 21:12:34 aflinta +- rebuild with new cairo, rel.2 + +Revision 1.91.2.3 2005/07/26 15:25:29 freetz +- 2.11.90, shutdown fix already in sources + +Revision 1.91.2.2 2005/07/06 17:51:15 wiget +- added small TODO + +Revision 1.91.2.1 2005/07/03 14:53:13 freetz +- 2.11.1 Revision 1.91 2005/06/17 21:10:45 twittner - cosmetics @@ -210,313 +228,3 @@ Revision 1.77.2.3 2005/03/07 17:31:58 wiget - updated to 2.10.0 - -Revision 1.77.2.2 2005/02/08 12:49:42 grzegol -- updated to 2.9.91 - -Revision 1.77.2.1 2005/02/06 20:14:13 grzegol -- updated to 2.9.2 - -Revision 1.77 2004/12/25 18:04:55 qboosh -- automake epoch - -Revision 1.76 2004/10/12 18:12:57 freetz -- 2.8.1, tested, ready for STBR - -Revision 1.75 2004/09/15 08:03:20 grzegol -- merged from DEVEL and updated to 2.8.0.1 -- removed locale-names patch and remove no locale in %%install -- removed am patch - not neccessary - -Revision 1.74 2004/08/26 09:29:07 aflinta -- up to version 2.6.4 - -Revision 1.73 2004/08/12 21:07:07 ankry -- s/Gnome/GNOME/ - -Revision 1.72 2004/07/02 13:43:05 aflinta -- up to version 2.6.3 - -Revision 1.71 2004/06/14 21:31:22 grzegol -- updated to 2.6.2 - -Revision 1.70.2.8 2004/08/30 13:23:45 grzegol -- updated to 2.7.92 - -Revision 1.70.2.7 2004/08/19 20:38:00 aflinta -- up to version 2.7.91.1 - -Revision 1.70.2.6 2004/08/17 16:41:46 aflinta -- up to version 2.7.91 - -Revision 1.70.2.5 2004/08/03 17:30:20 grzegol -- updated to 2.7.90 - -Revision 1.70.2.4 2004/07/09 14:07:30 grzegol -- updated to 2.7.3.1 -- removed outdated gconftool patch - -Revision 1.70.2.3 2004/07/07 16:39:12 grzegol -- added gconftool patch (make gconftool install schema files correctly) -- rel. 2 (don't use GConf2-2.7.3-1) - -Revision 1.70.2.2 2004/07/06 11:40:40 grzegol -- updated to 2.7.3 - -Revision 1.70.2.1 2004/06/05 14:15:31 freetz -- 2.7.1 - gnome 2.8 developement series - -Revision 1.70 2004/04/19 21:44:06 aflinta -- up to version 2.6.1 - -Revision 1.69 2004/03/23 18:56:14 qboosh -- let rpm decide about man compression; removed redundant doc for gtkdocdir - -Revision 1.68 2004/03/23 11:20:08 grzegol -- merged from DEVEL and updated to 2.6.0 - -Revision 1.67 2004/02/13 10:51:51 qboosh -- added locale-names patch, rename no->nb -- revised deps, release 3 - -Revision 1.66.2.4 2004/02/24 18:47:39 grzegol -- added BR: perl-base -- BR: gtk-doc >= 0.6 - -Revision 1.66.2.3 2004/02/24 18:41:47 aflinta -- up to version 2.5.90 - -Revision 1.66.2.2 2004/02/13 13:23:32 grzegol -- merged changes from HEAD: - - added locale-names patch (no -> nb) - - updated BRs,Rs -- rel. 2 - -Revision 1.66.2.1 2003/12/27 12:08:56 grzegol -- updated to 2.5.1 - -Revision 1.66 2003/12/14 19:14:39 wiget -- added am18.patch to fix gconf.m4 -- release 2 - -Revision 1.65 2003/10/09 11:21:50 qboosh -- bumped ORBit2 dependency to force version w/o linc -- BR: gtk-doc - -Revision 1.64 2003/09/10 19:48:19 aflinta -- version 2.4.0.1 - -Revision 1.63 2003/09/09 04:50:24 aflinta -- version 2.4.0 - -Revision 1.62 2003/08/27 00:16:31 gotar -- fixed changelog trailer - -Revision 1.61 2003/08/26 20:31:18 ankry -- s/[Gg]nome/GNOME/ - -Revision 1.60 2003/08/18 08:07:51 gotar -- mass commit: cosmetics (removed trailing white spaces) - -Revision 1.59 2003/07/06 23:27:13 blues -- many small fixes, mostly inpired by kloczek - -Revision 1.58 2003/06/23 22:02:06 aflinta -- version 2.3.3 - -Revision 1.57 2003/06/18 20:50:35 aflinta -- snap 20030618 for probper build with gcc 3.3 - -Revision 1.56 2003/05/25 11:00:50 malekith -- massive attack, adding Source-md5 - -Revision 1.55 2003/05/25 05:45:21 misi3k -- massive attack s/pld.org.pl/pld-linux.org/ - -Revision 1.54 2003/05/21 09:22:08 trojan -- s/bonobo-acitvation-devel/libbonobo-devel/ in {,Build}Requires - -Revision 1.53 2003/05/08 10:43:44 qboosh -- removed useless *.{la,a} for module - -Revision 1.52 2003/05/03 18:45:35 aflinta -- version 2.3.2 - -Revision 1.51 2003/04/18 06:11:31 kloczek -- merge translation from ALT Linux. - -Revision 1.50 2003/03/30 20:57:23 aflinta -- updated to snap 20030330, this snap seems to be more stable than pure version 2.3.1 - -Revision 1.49 2003/03/27 07:33:04 aflinta -- updated to version 2.3.1 - -Revision 1.48 2003/01/21 07:57:03 aflinta -- updated to version 2.2.0 - -Revision 1.47 2003/01/13 07:23:50 trojan -- fixed %%files (no need 755 for *.la) - -Revision 1.46 2003/01/13 00:28:01 aflinta -- updated to version 2.1.90 - -Revision 1.45 2002/12/07 15:41:36 aflinta -- rebuild with latest Xft - -Revision 1.44 2002/12/05 22:48:38 michuz -- updated BR - -Revision 1.43 2002/12/04 15:50:06 aflinta -- release 9 - -Revision 1.42 2002/12/04 13:45:11 michuz -- BR: freetype-devel - -Revision 1.41 2002/12/04 11:08:40 wrobell -- put conf files in /etc/%%{name} instead of /etc/%%{name}/%%{name} - -Revision 1.40 2002/12/03 13:58:29 wrobell -- changed _sysconfigdir to /etc/gconf - -Revision 1.39 2002/12/03 02:29:24 wrobell -- move to /usr prefix - -Revision 1.38 2002/11/25 14:12:18 ankry -- massive attack: no need for 755 for *.la - -Revision 1.37 2002/11/25 07:40:52 trojan -- revert last change - -Revision 1.36 2002/11/24 14:55:44 krzak -- br glib2 >= 2.1.3 - -Revision 1.35 2002/10/24 07:41:51 malekith -- release 7 - -Revision 1.34 2002/10/21 08:31:01 trojan -- fixed source URL -- enabled doc building - -Revision 1.33 2002/10/18 21:51:58 aflinta -- changed path.patch -- release 6 - -Revision 1.32 2002/10/10 10:42:52 trojan -- fixed %%files - -Revision 1.31 2002/10/07 09:15:23 qboosh -- BR: autoconf,automake,libtool - -Revision 1.30 2002/09/15 21:12:00 marcus -- rel.5. -- disabled rebuilding gtk-doc from docbook to html on ppc due to openjade -issues - "illegal instruction" - -Revision 1.29 2002/09/09 10:49:54 kura -- release 4 - -Revision 1.28 2002/09/07 05:29:38 kloczek -- merge unlock-dialog patch from rawhide (add dialog to offer to delete - gconf locks). - -Revision 1.27 2002/08/29 12:57:28 kura -- added path.patch -- release 3 - -Revision 1.26 2002/08/15 23:48:32 wolf -- fixed pkglibdir -- rel 2 - -Revision 1.25 2002/08/15 01:11:31 michuz -- updated %%files - -Revision 1.24 2002/08/15 00:31:47 michuz -- updated to 1.2.1 - -Revision 1.23 2002/07/02 12:44:31 ankry -- Requires gtk-doc-common for -devel subpackage -- release 2 - -Revision 1.22 2002/06/23 20:32:18 kloczek -- perl -pi -e "s/^libtoolize --copy --force/\%\{__libtoolize\}/" - -Revision 1.21 2002/06/12 09:11:14 wiget -updated to 1.2.0 - -Revision 1.20 2002/06/10 11:36:01 wiget -- updated to 1.1.11 -- rebuild gtk-doc (like in other packages) -- move gtk-doc to /usr/share/doc/gtk-doc - -Revision 1.19 2002/05/25 20:15:33 kloczek -- use new %doc infrastructure. - -Revision 1.18 2002/05/21 23:12:35 kloczek -perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \ - s/^automake -a -c -f/\%\{__automake\}/; \ - s/^autoconf/\%\{__autoconf\}/" - -Revision 1.17 2002/05/14 16:54:15 michuz -- new BR - -Revision 1.16 2002/05/14 10:47:18 wiget -%%files fix, release 2 - -Revision 1.15 2002/04/30 00:47:35 michuz -- updated to 1.1.10 - -Revision 1.14 2002/04/20 10:26:19 trojan -- revert %%ghost from %%files - -Revision 1.13 2002/04/18 22:29:10 misiek -- added am 1.6 fix - -Revision 1.12 2002/04/18 16:04:18 misiek -- fix BR - -Revision 1.11 2002/04/18 14:37:13 michuz -- release 4 -- fixed include files location (patch0) - -Revision 1.10 2002/04/17 12:38:08 trojan -- added %%ghost lib*.so.x (they're created by ldconfig) -- release 2; STBR - -Revision 1.9 2002/04/13 13:56:13 michuz -- updated to 1.1.9 -- fix broken includes - -Revision 1.8 2002/03/25 08:09:12 kloczek -- release 3: libGConf2{,-devel} added to Obsoletes for allow upgrade from MDK. - -Revision 1.7 2002/03/23 05:13:33 kloczek -- reelase 2: rebuild against gtk+ 2.0.0. - -Revision 1.6 2002/02/22 23:28:37 kloczek -- removed all Group fields translations (oure rpm now can handle translating - Group field using gettext). - -Revision 1.5 2002/02/21 01:01:46 kloczek -- remove gtk+2-devel and add bonobo-activation-devel, libxml2-devel to Requires list - in devel subpackage. - -Revision 1.4 2002/02/21 00:59:53 kloczek -- updated to 1.1.8, -- added gtk+2-devel to BuildRequires -- remove %%{_bindir}/gconf-sanity-check-2 from %files so now GConf2 do not - depends on gtk+2 in binatry package (it is only neccessary for test programs - and build gconf-sanity-check-2), -- hashed db3-devel from BuildRequires because db detections is broken (seems - GConf2 cen be builded without this and probably it will be good build also - in future GConf2 without bdb backend) -- added NO_MAJOR_VERSION patch with smarter distinguising paths between GConf1 - and GConf2. - -Revision 1.3 2002/01/18 02:12:10 kloczek -perl -pi -e "s/[EMAIL PROTECTED]/[EMAIL PROTECTED]/" - -Revision 1.2 2002/01/17 11:38:40 qboosh -- adapterized, cosmetics - -Revision 1.1 2002/01/17 02:19:44 michuz -- initial release ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/GConf2.spec?r1=1.92&r2=1.93&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
