SPECS: gtk+2.spec, isomaster.spec - sr at Latn -> sr at latin, rel. 4

[ankry]

Author: ankry                        Date: Sun Nov  4 23:07:39 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- sr at Latn -> sr at latin, rel. 4

---- Files affected:
SPECS:
   gtk+2.spec (1.259 -> 1.260) , isomaster.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: SPECS/gtk+2.spec
diff -u SPECS/gtk+2.spec:1.259 SPECS/gtk+2.spec:1.260
--- SPECS/gtk+2.spec:1.259	Thu Oct 25 17:40:47 2007
+++ SPECS/gtk+2.spec	Mon Nov  5 00:07:33 2007
@@ -16,7 +16,7 @@
 Summary(tr.UTF-8):	Gimp ToolKit arayüz kitaplığı
 Name:		gtk+2
 Version:	2.12.1
-Release:	3
+Release:	4
 Epoch:		2
 License:	LGPL v2+
 Group:		X11/Libraries
@@ -62,6 +62,8 @@
 Requires:	glib2 >= 1:2.14.2
 Requires:	pango >= 1:1.18.3
 Obsoletes:	gtk2
+# sr at Latn vs. sr at latin
+Conflicts:	glibc-misc < 6:2.7
 Conflicts:	gtk2-engines < 1:2.2.0-6
 # autopanog.exe crashes with gtk+2 2.8.x and libgdiplus 1.1.8
 Conflicts:	libgdiplus < 1.1.9
@@ -229,7 +231,8 @@
 install -d $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules
 
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/az_IR
-
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr at latin ] || \
+	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
 %find_lang %{name} --all-name
 
 %clean
@@ -330,6 +333,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.260  2007/11/04 23:07:33  ankry
+- sr at Latn -> sr at latin, rel. 4
+
 Revision 1.259  2007/10/25 15:40:47  qboosh
 - don't run non-existing binaries on erase
 

================================================================
Index: SPECS/isomaster.spec
diff -u SPECS/isomaster.spec:1.21 SPECS/isomaster.spec:1.22
--- SPECS/isomaster.spec:1.21	Sun Oct 28 19:02:30 2007
+++ SPECS/isomaster.spec	Mon Nov  5 00:07:33 2007
@@ -14,6 +14,8 @@
 BuildRequires:	pkgconfig
 BuildRequires:	sed >= 4.0
 Requires:	file
+# sr at Latn vs. sr at latin
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -41,6 +43,8 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/sr at Latn
 %find_lang %{name} --all-name
 
 %clean
@@ -62,6 +66,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2007/11/04 23:07:33  ankry
+- sr at Latn -> sr at latin, rel. 4
+
 Revision 1.21  2007/10/28 18:02:30  rotom
 - up to 1.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gtk+2.spec?r1=1.259&r2=1.260&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/isomaster.spec?r1=1.21&r2=1.22&f=u