Author: ankry                        Date: Sun Nov  4 22:52:31 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 6

---- Files affected:
SPECS:
   galeon.spec (1.270 -> 1.271) , glade2.spec (1.59 -> 1.60) 

---- Diffs:

================================================================
Index: SPECS/galeon.spec
diff -u SPECS/galeon.spec:1.270 SPECS/galeon.spec:1.271
--- SPECS/galeon.spec:1.270     Mon Oct 22 21:32:39 2007
+++ SPECS/galeon.spec   Sun Nov  4 23:52:25 2007
@@ -15,7 +15,7 @@
 Summary(zh_CN.UTF-8):  基于Gecko的GNOME流览器
 Name:          galeon
 Version:       2.0.3
-Release:       5
+Release:       6
 Epoch:         2
 License:       GPL
 Group:         X11/Applications/Networking
@@ -58,6 +58,8 @@
 Requires:      libbonobo >= 2.4.0
 %requires_eq_to        xulrunner xulrunner-devel
 Provides:      wwwbrowser
+# [EMAIL PROTECTED] vs. [EMAIL PROTECTED]
+Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # can be provided by mozilla or mozilla-embedded
@@ -124,6 +126,8 @@
 # No components installed now.
 #rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/*.la
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED] ] || \
+       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin}
 # galeon-2.0.mo, but gnome/help/galeon
 %find_lang galeon-2.0 --with-gnome --all-name
 
@@ -163,6 +167,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.271  2007/11/04 22:52:25  ankry
+- [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 6
+
 Revision 1.270  2007/10/22 19:32:39  megabajt
 - release 5 (xulrunner 1.8.1.8)
 

================================================================
Index: SPECS/glade2.spec
diff -u SPECS/glade2.spec:1.59 SPECS/glade2.spec:1.60
--- SPECS/glade2.spec:1.59      Tue Oct  9 17:31:11 2007
+++ SPECS/glade2.spec   Sun Nov  4 23:52:25 2007
@@ -8,7 +8,7 @@
 Summary(uk.UTF-8):     Діалогова побудова інтерфейсів на основі GTK+2
 Name:          glade2
 Version:       2.12.1
-Release:       5
+Release:       6
 License:       GPL v2+
 Group:         Development/Building
 Source0:       
http://ftp.gnome.org/pub/gnome/sources/glade/2.12/glade-%{version}.tar.bz2
@@ -34,6 +34,8 @@
 # loads libgail.so, libgail-gnome.so GTK+ modules on start
 Requires:      gail
 Requires:      libgail-gnome
+# [EMAIL PROTECTED] vs. [EMAIL PROTECTED]
+Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -109,6 +111,8 @@
        DESTDIR=$RPM_BUILD_ROOT
 
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED] ] || \
+       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin}
 # glade-2.0.mo, but gnome/help/glade-2 - use --all-name
 %find_lang glade-2.0 --all-name --with-gnome
 
@@ -136,6 +140,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.60  2007/11/04 22:52:25  ankry
+- [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 6
+
 Revision 1.59  2007/10/09 15:31:11  baggins
 - s/enviroment/environment/
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/galeon.spec?r1=1.270&r2=1.271&f=u
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/glade2.spec?r1=1.59&r2=1.60&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to