SPECS: libbonobo.spec, libbonoboui.spec - sr at Latn -> sr at latin; rel...

[megabajt]

Author: megabajt                     Date: Sun Nov 11 11:38:41 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- sr at Latn -> sr at latin; release 2

---- Files affected:
SPECS:
   libbonobo.spec (1.112 -> 1.113) , libbonoboui.spec (1.94 -> 1.95) 

---- Diffs:

================================================================
Index: SPECS/libbonobo.spec
diff -u SPECS/libbonobo.spec:1.112 SPECS/libbonobo.spec:1.113
--- SPECS/libbonobo.spec:1.112	Mon Oct 15 17:36:48 2007
+++ SPECS/libbonobo.spec	Sun Nov 11 12:38:36 2007
@@ -8,7 +8,7 @@
 Summary(pt_BR.UTF-8):	Biblioteca para documentos compostos no GNOME
 Name:		libbonobo
 Version:	2.20.1
-Release:	1
+Release:	2
 License:	GPL
 Group:		Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.20/%{name}-%{version}.tar.bz2
@@ -35,6 +35,8 @@
 Provides:	bonobo-activation = %{version}
 Obsoletes:	bonobo-activation
 Obsoletes:	libbonobo0
+# sr at Latn vs. sr at latin
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -102,6 +104,9 @@
 %setup -q
 sed -i -e 's|/lib|/%{_lib}|g' utils/bonobo-slay.in
 
+sed -i -e s#sr\@Latn#sr\@latin# po/LINGUAS
+mv -f po/sr\@{Latn,latin}.po
+
 %build
 %{__gtkdocize}
 %{__glib_gettextize}
@@ -186,7 +191,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.112  2007-10-15 15:36:48  megabajt
+Revision 1.113  2007-11-11 11:38:36  megabajt
+- sr at Latn -> sr at latin; release 2
+
+Revision 1.112  2007/10/15 15:36:48  megabajt
 - updated to 2.20.1
 
 Revision 1.111  2007/10/09 15:31:11  baggins

================================================================
Index: SPECS/libbonoboui.spec
diff -u SPECS/libbonoboui.spec:1.94 SPECS/libbonoboui.spec:1.95
--- SPECS/libbonoboui.spec:1.94	Mon Sep 17 16:19:21 2007
+++ SPECS/libbonoboui.spec	Sun Nov 11 12:38:36 2007
@@ -7,32 +7,34 @@
 Summary(pl.UTF-8):	Komponenty interfejsu użytkownika do Bonobo
 Name:		libbonoboui
 Version:	2.20.0
-Release:	1
+Release:	2
 License:	LGPL
 Group:		X11/Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/libbonoboui/2.20/%{name}-%{version}.tar.bz2
 # Source0-md5:	14427a459f6ca355de5f5e47ce95c1c4
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.19.1
+BuildRequires:	GConf2-devel >= 2.20.0
 BuildRequires:	ORBit2-devel >= 1:2.14.8
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1:1.9
-BuildRequires:	gnome-common >= 2.12.0
-BuildRequires:	gtk+2-devel >= 2:2.10.14
+BuildRequires:	gnome-common >= 2.20.0
+BuildRequires:	gtk+2-devel >= 2:2.12.0
 BuildRequires:	gtk-doc >= 1.8
 BuildRequires:	intltool >= 0.36.1
 BuildRequires:	libbonobo-devel >= 2.20.0
 BuildRequires:	libglade2-devel >= 1:2.6.2
-BuildRequires:	libgnomecanvas-devel >= 2.19.2
-BuildRequires:	libgnome-devel >= 2.19.1
+BuildRequires:	libgnomecanvas-devel >= 2.20.0
+BuildRequires:	libgnome-devel >= 2.20.0
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 1:2.6.29
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
-Requires:	GConf2 >= 2.19.1
+Requires:	GConf2 >= 2.20.0
 Requires:	libbonobo >= 2.20.0
-Requires:	libgnome >= 2.19.1
-Requires:	libgnomecanvas >= 2.19.2
+Requires:	libgnome >= 2.20.0
+Requires:	libgnomecanvas >= 2.20.0
+# sr at Latn vs. sr at latin
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -50,12 +52,12 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe libbonoboui
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	GConf2-devel >= 2.19.1
+Requires:	GConf2-devel >= 2.20.0
 Requires:	ORBit2-devel >= 2.14.8
-Requires:	libbonobo-devel >= 2.19.6
+Requires:	libbonobo-devel >= 2.20.0
 Requires:	libglade2-devel >= 1:2.6.2
-Requires:	libgnome-devel >= 2.19.1
-Requires:	libgnomecanvas-devel >= 2.19.2
+Requires:	libgnome-devel >= 2.20.0
+Requires:	libgnomecanvas-devel >= 2.20.0
 Requires:	libxml2-devel >= 1:2.6.29
 
 %description devel
@@ -120,6 +122,9 @@
 %prep
 %setup -q
 
+sed -i -e s#sr\@Latn#sr\@latin# po/LINGUAS
+mv -f po/sr\@{Latn,latin}.po
+
 %build
 %{__gtkdocize}
 %{__glib_gettextize}
@@ -201,6 +206,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.95  2007-11-11 11:38:36  megabajt
+- sr at Latn -> sr at latin; release 2
+
 Revision 1.94  2007-09-17 14:19:21  patrys
 - 2.20.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/libbonobo.spec?r1=1.112&r2=1.113&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/libbonoboui.spec?r1=1.94&r2=1.95&f=u