SPECS: glib2.spec - merged from DEVEL
arekm
arekm at pld-linux.org
Tue Aug 30 20:03:03 CEST 2005
Author: arekm Date: Tue Aug 30 18:03:03 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merged from DEVEL
---- Files affected:
SPECS:
glib2.spec (1.111 -> 1.112)
---- Diffs:
================================================================
Index: SPECS/glib2.spec
diff -u SPECS/glib2.spec:1.111 SPECS/glib2.spec:1.112
--- SPECS/glib2.spec:1.111 Thu Aug 11 11:46:18 2005
+++ SPECS/glib2.spec Tue Aug 30 20:02:53 2005
@@ -1,5 +1,4 @@
# $Revision$, $Date$
-#
# Conditional build:
%bcond_without doc # disable gtk-doc
%bcond_without static_libs # don't build static library
@@ -17,14 +16,14 @@
Summary(tr): Yararlý ufak yordamlar kitaplýđý
Summary(zh_CN): ĘľÓĂš¤žßşŻĘýżâ
Name: glib2
-Version: 2.6.6
+Version: 2.8.1
Release: 1
Epoch: 1
License: LGPL
Group: Libraries
-Source0: http://ftp.gnome.org/pub/gnome/sources/glib/2.6/glib-%{version}.tar.bz2
-# Source0-md5: 6e22b0639d314536f23ee118f29b43de
-Patch0: %{name}-DESTDIR.patch
+Source0: ftp://ftp.gtk.org/pub/gtk/v2.8/glib-%{version}.tar.bz2
+# Source0-md5: 2229ca9d5490a87d5e027e029520df14
+Patch0: %{name}-makefile.patch
Patch1: %{name}-SEGV.patch
URL: http://www.gtk.org/
BuildRequires: autoconf >= 2.54
@@ -213,6 +212,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.112 2005/08/30 18:02:53 arekm
+- merged from DEVEL
+
Revision 1.111 2005/08/11 09:46:18 radek
- bcond_with(out) is followed by one \t, then bcond's name.
@@ -225,543 +227,32 @@
Revision 1.108 2005/06/27 19:47:01 adgor
- wo doc bcond
-Revision 1.107 2005/06/15 21:14:59 witekfl
-- added header "Conditional build:"
-
-Revision 1.106 2005/06/15 17:30:50 witekfl
-- s/bcond_without static/bcond_without static_libs/
-
-Revision 1.105 2005/06/14 19:33:48 witekfl
-- renamed static_libs -> static
-
-Revision 1.104 2005/06/14 15:59:58 witekfl
-- added bcond_without static_libs
-
-Revision 1.103 2005/06/11 18:55:37 freetz
-- 2.6.5
-
-Revision 1.102 2005/04/12 19:23:21 freetz
-- reversed ldconfig changes
-
-Revision 1.101 2005/04/07 21:09:17 freetz
-- 2.6.4, new style macros, BRs updated
-
-Revision 1.100 2005/03/29 22:11:36 qboosh
-- revert - let static remain static, not to be included in shared libs/modules; release 3
-
-Revision 1.99 2005/03/28 22:28:46 adamg
-- pass -fPIC (fixes build of libextractor); release 2
-
-Revision 1.98 2005/02/28 11:35:54 paladine
-- updated to 2.6.3
-
-Revision 1.97 2005/02/04 15:37:31 grzegol
-- updated to 2.6.2
-
-Revision 1.96 2005/01/17 09:34:34 saq
-- SEGV.patch: don't crash if "$G_FILENAME_ENCODING"==""
-- release 2
-
-Revision 1.95 2005/01/09 21:26:08 aflinta
-- up to version 2.6.1 (contains many bugfixes)
-
-Revision 1.94 2004/12/25 18:04:55 qboosh
-- automake epoch
-
-Revision 1.93 2004/12/20 09:50:58 qboosh
-- macros BR is enough
-
-Revision 1.92 2004/12/19 09:14:28 aflinta
- - merged from DEVEL
- - release 2 for easier upgrade from DEVEL buggy versions
-
-Revision 1.83.2.13 2004/12/19 09:00:47 aflinta
-- fixed bug 161668, simplified locale fix, seems to be working and ready to merge to HEAD
-
-Revision 1.83.2.12 2004/12/17 08:58:46 krzak
-- up to 2.6.0
-
-Revision 1.83.2.11 2004/12/03 09:51:31 paladine
-- updated to 2.5.7
-- updated locale names patch
-
-Revision 1.83.2.10 2004/11/12 18:04:52 paladine
-- updated to 2.5.6
-
-Revision 1.83.2.9 2004/11/03 09:43:16 paladine
-- updated to 2.5.5
-
-Revision 1.83.2.8 2004/11/01 19:27:46 grzegol
-- readded locale-names patch
-
-Revision 1.83.2.7 2004/11/01 18:25:44 grzegol
-- updated to 2.5.4
-- removed outdated locale-names patch
-- remove no locale in %%install
-
-Revision 1.83.2.6 2004/09/18 22:49:41 grzegol
-- updated to 2.5.3
-
-Revision 1.83.2.5 2004/08/27 22:40:05 grzegol
-- iconv dependency moved from gtk+2 to glib2 (change merged from HEAD)
-
-Revision 1.83.2.4 2004/08/25 13:10:02 grzegol
-- updated to 2.5.2
-
-Revision 1.83.2.3 2004/08/02 10:41:42 grzegol
-- attr 755 for %%{_datadir}/glib-2.0/gettext/mkinstalldirs
-- rel. 2
-
-Revision 1.83.2.2 2004/08/01 13:44:03 grzegol
-- updated to 2.5.1
-
-Revision 1.83.2.1 2004/07/20 18:42:07 grzegol
-- updated to 2.5.0
-
-Revision 1.91 2004/12/02 22:52:28 grzegol
-- updated to 2.4.8
-
-Revision 1.90 2004/11/27 19:21:08 saq
-- massive attack: more BR epoch fixes
-
-Revision 1.89 2004/10/26 11:54:05 qboosh
-- use rpmbuild(macros) deps for _gtkdocdir
-
-Revision 1.88 2004/10/09 10:08:56 freetz
-- 2.4.7, dropped locale patch
-
-Revision 1.87 2004/08/27 19:01:40 qboosh
-- iconv dependency moved from gtk+2 to glib2
-
-Revision 1.86 2004/08/16 21:38:36 aflinta
-- readded locale-names.patch and remove no translation (nb is included)
-
-Revision 1.85 2004/08/13 18:08:07 aflinta
-- up to version 2.4.6, locale patch is now oboslete
-
-Revision 1.84 2004/07/31 18:27:08 freetz
-- 2.4.5
-
-Revision 1.83 2004/07/09 14:24:11 grzegol
-- updated to 2.4.4
-
-Revision 1.82 2004/06/04 19:01:55 aflinta
-- up to version 2.4.2
-
-Revision 1.81 2004/04/30 16:51:29 grzegol
-- updated to 2.4.1
-
-Revision 1.80 2004/03/19 09:09:37 qboosh
-- cleanups (mostly reapplied those lost on merge), updated ac/am deps
-- removed bogus es
-- don't rename manuals (binaries still have glib-* names)
-
-Revision 1.79 2004/03/19 08:00:44 aflinta
-- merged from devel
-
-Revision 1.70.2.17 2004/03/16 21:28:19 aflinta
-- up to version 2.4.0, I suggest to move it to HEAD now
-
-Revision 1.70.2.16 2004/03/14 16:18:40 grzegol
-- epoch 1
-
-Revision 1.70.2.15 2004/03/11 13:09:33 freetz
-- debug ready (stolen from HEAD)
-
-Revision 1.70.2.14 2004/03/09 18:49:32 grzegol
-- updated to 2.3.6
-
-Revision 1.70.2.13 2004/03/02 08:23:42 aflinta
-- up to version 2.3.5
-
-Revision 1.70.2.12 2004/02/24 20:57:21 grzegol
-- updated to 2.3.3
-- added locale-names patch (changes locale no -> nb)
-- strict internal deps
-- rebuild man pages (--enable-man)
-
-Revision 1.70.2.11 2004/01/22 23:35:44 grzegol
-- updated to 2.3.2
-
-Revision 1.70.2.10 2004/01/14 22:17:01 grzegol
-- updated to 2.3.1-20040114 snap
-- regenerate gtkdoc
-
-Revision 1.70.2.9 2003/12/14 21:56:05 wiget
-- use local *.m4
-
-Revision 1.70.2.8 2003/12/14 19:41:20 wiget
-- fix underquote in glib*.m4 detected by automake 1.8
-- release 2
-
-Revision 1.70.2.7 2003/12/08 23:34:37 wiget
-- up to released 2.3.1
-
-Revision 1.70.2.6 2003/11/27 12:54:07 wiget
-- 2.3.1 snap 20031126
-
-Revision 1.70.2.5 2003/11/10 23:05:23 wiget
-- updated to 20031110 snapshot
-
-Revision 1.70.2.4 2003/11/06 21:21:14 wiget
-- sources from dropin
-
-Revision 1.70.2.3 2003/11/06 21:19:07 wiget
-- updated to snap 20031106
-
-Revision 1.70.2.2 2003/10/26 16:23:45 ankry
-- it is 2.3
-
-Revision 1.70.2.1 2003/10/26 15:36:26 wiget
-- updated to 2.3.0
-
-Revision 1.70 2003/08/26 21:18:38 aflinta
-- release 1
-
-Revision 1.69 2003/08/26 18:50:46 grzegol
-- updated to 2.2.3-rc1
-
-Revision 1.68 2003/06/14 17:47:29 wolf
-- NEWS from devel to main package
-
-Revision 1.67 2003/06/09 10:01:24 krzak
-- update to 2.2.2
-
-Revision 1.66 2003/05/25 11:00:51 malekith
-- massive attack, adding Source-md5
-
-Revision 1.65 2003/05/25 05:47:58 misi3k
-- massive attack s/pld.org.pl/pld-linux.org/
-
-Revision 1.64 2003/05/22 09:29:53 trojan
-- removed obsolete hack
-
-Revision 1.63 2003/02/03 13:07:12 trojan
-- updated to 2.2.1
-
-Revision 1.62 2003/01/02 23:23:25 juandon
-- pkgconfig >= 0.14.0
-
-Revision 1.61 2002/12/21 10:45:57 aflinta
-- updated to version 2.2.0 - it is stable now
-
-Revision 1.60 2002/12/17 11:46:29 aflinta
-- updated to version 2.1.5
-
-Revision 1.59 2002/12/12 06:35:25 aflinta
-- updated to version 2.1.4
-
-Revision 1.58 2002/12/04 14:20:20 aflinta
-- _gtkdocdir is now in rpm macros, relese 2
-
-Revision 1.57 2002/12/04 10:34:10 qboosh
-- Source0 exists now
-
-Revision 1.56 2002/12/03 19:14:23 misiek
-- updated to 2.1.3
-
-Revision 1.55 2002/11/25 14:13:04 ankry
-- massive attack: no need for 755 for *.la
-
-Revision 1.54 2002/11/23 12:02:06 aflinta
-- updated to version 2.1.3 snap 20021123
-
-Revision 1.53 2002/11/19 18:47:02 mmazur
-- no need for this workaround since libtool is fixed
-
-Revision 1.52 2002/11/17 22:12:50 mmazur
-- fixed the workaround for -L... it will have to do till the authors fix the
-sources (or sth)
-
-Revision 1.51 2002/10/22 18:58:59 malekith
-- release 3
-
-Revision 1.50 2002/10/14 14:31:53 malekith
-- fixed typo in pthread kludge
-- release 2
-
-Revision 1.49 2002/10/11 20:27:05 malekith
-- added workaround for not linking -lpthread
-
-Revision 1.48 2002/10/09 13:14:24 kloczek
-- use more macros, some cosmetics, added missing "rm -f missing" and use new %doc
-
-Revision 1.47 2002/10/09 07:35:40 trojan
-- fixed files
-
-Revision 1.46 2002/10/02 11:10:34 trojan
-- release 1; STBR
-
-Revision 1.45 2002/10/01 12:28:39 grzegol
-- s/--enable-gtkdoc/--enable-gtk-doc/
-
-Revision 1.44 2002/09/30 18:35:13 grzegol
-- BR: gtk-doc >= 0.9-4
-- s/--disable-gtkdoc/--enable-gtkdoc/
-
-Revision 1.43 2002/09/28 18:38:12 aflinta
-- started update to future version 2.1.0
-
-Revision 1.42 2002/08/27 09:46:37 kura
-- BR: gettext-devel
-
-Revision 1.41 2002/08/21 14:37:54 kloczek
-- release 5.
-
-Revision 1.40 2002/08/21 10:39:12 michuz
-- typo
-
-Revision 1.39 2002/08/20 09:28:26 kloczek
-- release 4: o not run gettextize in on regenerate ac/am/lt suit.
-
-Revision 1.38 2002/08/17 00:21:34 kloczek
-- bump release to 3.
-
-Revision 1.37 2002/08/17 00:18:43 kloczek
-- added am16: full regenerate ac/am/lt files is back.
-
-Revision 1.36 2002/08/14 23:26:57 michuz
-- updated to 2.0.6
-
-Revision 1.35 2002/07/18 00:38:48 kloczek
-- bump to release 3.
-
-Revision 1.34 2002/07/02 12:44:34 ankry
-- Requires gtk-doc-common for -devel subpackage
-- release 2
-
-Revision 1.33 2002/06/17 10:10:11 wiget
-updated to 2.0.4
-
-Revision 1.32 2002/06/05 07:19:20 wiget
-BR gtk-doc
-
-Revision 1.31 2002/06/05 07:17:54 wiget
-- move gtk-doc to proper place
-- add %{_datadir}/glib-2.0 to package
-- Release: 3
-
-Revision 1.30 2002/06/04 23:20:27 kloczek
-- merge translations from TurboLinux and Conectiva.
-
-Revision 1.29 2002/06/04 18:50:51 aflinta
-- release up
-- STBR
-
-Revision 1.28 2002/06/04 18:46:05 aflinta
-- added missing directory - /usr/share/glib-2.0
-
-Revision 1.27 2002/05/30 13:00:41 qboosh
-- use optflags
-- don't call gettextize - it doesn't work with gettext 0.11 because of
- AM_GLIB_GNU_GETTEXT macro
-- some fixes and cosmetics in pl translation
-
-Revision 1.26 2002/05/28 05:46:27 kloczek
-- updated to 2.0.3 and use new %doc.
-
-Revision 1.25 2002/05/21 23:13:10 kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
- s/^automake -a -c -f/\%\{__automake\}/; \
- s/^autoconf/\%\{__autoconf\}/"
-
-Revision 1.24 2002/04/25 16:24:51 arturs
-fixed a small typo
-
-Revision 1.23 2002/04/13 07:21:53 kloczek
-- updated to 2.0.1.
-
-Revision 1.22 2002/03/09 20:08:27 kloczek
-- updated to final 2.0.0.
-
-Revision 1.21 2002/03/07 10:18:16 misiek
-- updated to 2.0.0 release candidate 1
-
-Revision 1.20 2002/02/23 02:17:44 kloczek
-- adapterized.
-
-Revision 1.19 2002/02/22 23:28:57 kloczek
-- removed all Group fields translations (our rpm now can handle translating
- Group field using gettext).
-
-Revision 1.18 2002/02/18 23:01:33 misiek
-- updated to 1.3.14
-
-Revision 1.17 2002/01/31 22:20:46 kloczek
-- updated to 1.3.13 (bugfix release).
-
-Revision 1.16 2002/01/18 02:13:06 kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
-
-Revision 1.15 2002/01/13 00:31:12 kloczek
-- release 2,
-- disable using gtk-doc (added --enable-gtk-doc=no to %%configure parameters)
- for alow build also on AXP (openjade fails on build sgml documents on AXP).
-
-Revision 1.14 2002/01/12 19:38:31 michuz
-- updated to 1.3.12
-
-Revision 1.13 2001/10/28 13:43:07 misiek
-- more fixed (m4 and pkgconfig)
-
-Revision 1.12 2001/10/28 12:58:43 misiek
-- add DESTDIR patch
-
-Revision 1.11 2001/10/28 12:31:01 misiek
-- updated to 1.3.10
-
-Revision 1.10 2001/09/21 13:59:51 misiek
-updated to 1.3.8
-
-Revision 1.9 2001/09/06 17:29:17 kloczek
-- updated to 1.3.7 and removed outdated fix patch.
-
-Revision 1.8 2001/08/16 23:26:20 kloczek
-- merge fix patch from rawhide (small correction for utf8 handling).
-
-Revision 1.7 2001/08/16 23:15:22 kloczek
-- release 7.
-
-Revision 1.6 2001/08/15 16:52:38 mkochano
-- Updated to 1.3.6.
-- Some dirty trick to link gobject against just built version of glib.
-- Updeted %%files section.
-- Fixed %%install section.
-- Added calls to gettextize (it does not contains any po files, but will
- not build without this) and autoconf (works with ac2.5).
-
-Revision 1.5 2001/07/26 05:42:07 saq
-- reverting last change: removing new macros from %p{re,ost}{,un}
-
-Revision 1.3 2001/06/12 11:54:48 wiget
-- name changed to glib2 (now is posible to have installed glib 1.2.x and glib
- 1.3.x)
-- glib-config man page moved to glib-config-2.0
-
-Revision 1.2 2001/06/12 10:15:43 cieciwa
--updated to version 1.3.5,
--rewrited from OLD glib.spec.
-
-Revision 1.72 2001/04/13 06:17:11 kloczek
-- release 2.
-
-Revision 1.71 2001/04/11 23:15:17 qboosh
-- use %%_pkgconfigdir macro
-- typo
-
-Revision 1.70 2001/04/02 10:25:54 kloczek
-- updated to 1.2.10.
-
-Revision 1.69 2001/03/18 20:50:49 kloczek
-- bump release to 2.
-
-Revision 1.68 2001/03/03 12:06:20 kloczek
-- removed gccwarn patch,
-- added lib*.la and pkgconfig files to devel.
-
-Revision 1.67 2001/03/03 11:41:22 misiek
-1.2.9; stb
-
-Revision 1.66 2000/11/25 02:54:39 kloczek
-- added "Epoch: 1" for allow upgrade from RH version.
-
-Revision 1.65 2000/11/25 02:47:10 kloczek
-- release 6: merge rawhide gccwarn patch.
-
-Revision 1.64 2000/09/30 19:57:42 kloczek
-- release 5: use rpm new automation suit.
-
-Revision 1.63 2000/08/31 05:57:36 kloczek
-- back 1.2.8 on HEAD,
-- release 4.
-
-Revision 1.62 2000/08/28 15:12:47 klakier
-- changes for version 1.3
-
-Revision 1.61 2000/06/21 16:43:10 kloczek
-- release 2.
-
-Revision 1.60 2000/06/09 07:54:41 kloczek
-- more %%{__make} macros.
-
-Revision 1.59 2000/06/09 07:22:51 kloczek
-- added using %%{__make} macro.
-
-Revision 1.58 2000/05/25 17:07:56 kloczek
-- updated to 1.2.8.
-
-Revision 1.57 2000/05/24 16:50:45 zagrodzki
-- changed [ -x ... ] && to [ ! -x ... ] ||
-
-Revision 1.56 2000/05/18 23:33:05 kloczek
-- release 4,
-- spec adapterized,
-- added using %%{_aclocaldir} macro.
-
-Revision 1.55 2000/05/15 00:13:29 kloczek
-- release 3.
-
-Revision 1.54 2000/05/01 20:11:40 zagrodzki
-- removed Prereq: /usr/sbin/fix-info-dir
-- fix-info-dir in %pre/post is executed only when info is already
- installed
-
-Revision 1.53 2000/04/01 11:14:31 zagrodzki
-- changed all BuildRoot definitons
-- removed all applnkdir defs
-- changed some prereqs/requires
-- removed duplicate empty lines
-
-Revision 1.52 2000/03/28 16:54:18 baggins
-- translated kloczkish into english
-
-Revision 1.51 2000/02/16 23:55:22 kloczek
-- updated to 1.2.7 (rel 2).
-
-Revision 1.50 1999/12/30 20:11:04 kloczek
-- release 3 (in RH 6.1 is 2).
-
-Revision 1.49 1999/12/18 16:05:31 cieciwa
-- moveing back glibconfig.h to /usr/lib/glib/include.
-
-Revision 1.48 1999/12/17 15:02:20 cieciwa
-- fixes %files field.
-
-Revision 1.47 1999/12/17 14:56:23 cieciwa
-- release 2,
-- moved config file from /usr/lib/glib/include to /usr/include.
-
-Revision 1.46 1999/10/12 18:00:48 kloczek
-- updated to 1.2.6.
+Revision 1.108.2.10 2005/08/23 07:45:11 paladine
+- updated to 2.8.1
-Revision 1.45 1999/09/24 23:11:48 kloczek
-- updated Source url.
+Revision 1.108.2.9 2005/08/14 00:04:25 freetz
+- 2.8.0
-Revision 1.44 1999/09/24 23:09:39 kloczek
-- updated to 1.2.5.
+Revision 1.108.2.8 2005/08/05 18:49:52 paladine
+- updated to 2.7.7
-Revision 1.43 1999/09/24 10:45:02 pius
-- moved running of /usr/sbin/fix-info-dir to %%postun
-- release up
+Revision 1.108.2.7 2005/08/04 08:02:04 aflinta
+- version 2.7.6
-Revision 1.42 1999/09/19 09:47:49 pius
-- new {un}registering procedure for info pages using /usr/sbin/fix-info-dir,
-- standarization to "* text: (link). description" index info entries format.
+Revision 1.108.2.6 2005/08/03 16:22:33 freetz
+- fix for http://bugzilla.gnome.org/show_bug.cgi?id=312402, rel.2
-Revision 1.41 1999/09/08 23:21:44 kloczek
-- simplifications in %build.
+Revision 1.108.2.5 2005/08/02 17:36:55 freetz
+- 2.7.5
-Revision 1.40 1999/08/29 20:20:25 kloczek
-- added cs, da, de, fi, fr, tr translations from MandrakeLinux spec file.
+Revision 1.108.2.4 2005/07/23 10:16:50 freetz
+- 2.7.4
-Revision 1.39 1999/08/29 14:33:54 kloczek
-- updated to 1.2.4.
+Revision 1.108.2.3 2005/07/16 17:01:24 freetz
+- 2.7.3
-Revision 1.38 1999/07/12 23:05:57 kloczek
-- added using CVS keywords in %changelog (for automating them).
+Revision 1.108.2.2 2005/07/09 22:14:38 freetz
+- 2.7.2
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SPECS/glib2.spec?r1=1.111&r2=1.112&f=u
More information about the pld-cvs-commit
mailing list