Author: ankry                        Date: Sun Nov  4 23:57:08 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 2

---- Files affected:
SPECS:
   gnome-nettool.spec (1.22 -> 1.23) , gnome-panel.spec (1.202 -> 1.203) , 
gnome-power-manager.spec (1.51 -> 1.52) , gnome-screensaver.spec (1.50 -> 1.51) 
, gnome-session.spec (1.127 -> 1.128) , gnome-spell.spec (1.34 -> 1.35) , 
gnome-system-monitor.spec (1.57 -> 1.58) , gnome-terminal.spec (1.90 -> 1.91) , 
gnome-themes.spec (1.73 -> 1.74) , gnome-vfs2.spec (1.197 -> 1.198) 

---- Diffs:

================================================================
Index: SPECS/gnome-nettool.spec
diff -u SPECS/gnome-nettool.spec:1.22 SPECS/gnome-nettool.spec:1.23
--- SPECS/gnome-nettool.spec:1.22       Tue Sep 18 20:03:29 2007
+++ SPECS/gnome-nettool.spec    Mon Nov  5 00:57:02 2007
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):     Interfejs dla narzędzi sieciowych dla GNOME
 Name:          gnome-nettool
 Version:       2.20.0
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       
http://ftp.gnome.org/pub/GNOME/sources/gnome-nettool/2.20/%{name}-%{version}.tar.bz2
@@ -24,6 +24,8 @@
 Requires(post,postun): gtk+2
 Requires(post,postun): hicolor-icon-theme
 Requires(post,postun): scrollkeeper
+# [EMAIL PROTECTED] vs. [EMAIL PROTECTED]
+Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -53,6 +55,8 @@
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED] ] || \
+       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin}
 %find_lang %{name} --with-gnome
 
 %clean
@@ -94,6 +98,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2007/11/04 23:57:02  ankry
+- [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 2
+
 Revision 1.22  2007/09/18 18:03:29  megabajt
 - updated to 2.20.0; merged from DEVEL
 

================================================================
Index: SPECS/gnome-panel.spec
diff -u SPECS/gnome-panel.spec:1.202 SPECS/gnome-panel.spec:1.203
--- SPECS/gnome-panel.spec:1.202        Tue Oct 16 19:28:23 2007
+++ SPECS/gnome-panel.spec      Mon Nov  5 00:57:02 2007
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):     Podstawowe programy środowiska graficznego GNOME
 Name:          gnome-panel
 Version:       2.20.1
-Release:       1
+Release:       2
 License:       LGPL
 Group:         X11/Applications
 Source0:       
http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.20/%{name}-%{version}.tar.bz2
@@ -46,6 +46,8 @@
 Requires:      xdg-menus
 Suggests:      gnome-utils-screenshot
 Suggests:      gnome-utils-search-tool
+# [EMAIL PROTECTED] vs. [EMAIL PROTECTED]
+Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -153,6 +155,8 @@
 
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-default-setup.entries
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED] ] || \
+       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin}
 %find_lang %{name} --with-gnome --all-name
 
 %clean
@@ -322,6 +326,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.203  2007/11/04 23:57:02  ankry
+- [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 2
+
 Revision 1.202  2007/10/16 17:28:23  megabajt
 - updated to 2.20.1
 

================================================================
Index: SPECS/gnome-power-manager.spec
diff -u SPECS/gnome-power-manager.spec:1.51 SPECS/gnome-power-manager.spec:1.52
--- SPECS/gnome-power-manager.spec:1.51 Tue Sep 18 12:55:09 2007
+++ SPECS/gnome-power-manager.spec      Mon Nov  5 00:57:02 2007
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):     Zarządca energii dla GNOME
 Name:          gnome-power-manager
 Version:       2.20.0
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       
http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/2.20/%{name}-%{version}.tar.bz2
@@ -40,6 +40,8 @@
 Requires:      gnome-session >= 2.19.90
 Requires:      notification-daemon >= 0.3.5
 Obsoletes:     gnome-power
+# [EMAIL PROTECTED] vs. [EMAIL PROTECTED]
+Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -110,6 +112,8 @@
        DESTDIR=$RPM_BUILD_ROOT \
        autostartdir=%{_datadir}/gnome/autostart
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED] ] || \
+       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin}
 %find_lang %{name} --all-name --with-gnome
 
 %clean
@@ -167,6 +171,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.52  2007/11/04 23:57:02  ankry
+- [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 2
+
 Revision 1.51  2007/09/18 10:55:09  patrys
 - 2.20.0
 

================================================================
Index: SPECS/gnome-screensaver.spec
diff -u SPECS/gnome-screensaver.spec:1.50 SPECS/gnome-screensaver.spec:1.51
--- SPECS/gnome-screensaver.spec:1.50   Tue Sep 18 19:47:48 2007
+++ SPECS/gnome-screensaver.spec        Mon Nov  5 00:57:02 2007
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):     Wygaszacz ekranu GNOME
 Name:          gnome-screensaver
 Version:       2.20.0
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         X11/Applications
 Source0:       
http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/2.20/%{name}-%{version}.tar.bz2
@@ -36,6 +36,8 @@
 Requires:      libgnomeui >= 2.18.1
 Requires:      xdg-menus
 Obsoletes:     xscreensaver-gnome2
+# [EMAIL PROTECTED] vs. [EMAIL PROTECTED]
+Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -105,6 +107,8 @@
 done
 cd $_DIR
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED] ] || \
+       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin}
 %find_lang %{name}
 
 %clean
@@ -146,6 +150,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.51  2007/11/04 23:57:02  ankry
+- [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 2
+
 Revision 1.50  2007/09/18 17:47:48  patrys
 - 2.20.0
 

================================================================
Index: SPECS/gnome-session.spec
diff -u SPECS/gnome-session.spec:1.127 SPECS/gnome-session.spec:1.128
--- SPECS/gnome-session.spec:1.127      Tue Oct 16 19:54:49 2007
+++ SPECS/gnome-session.spec    Mon Nov  5 00:57:02 2007
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):     Programy dla desktopu środowiska graficznego GNOME2
 Name:          gnome-session
 Version:       2.20.1
-Release:       1
+Release:       2
 License:       LGPL
 Group:         X11/Applications
 Source0:       
http://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.20/%{name}-%{version}.tar.bz2
@@ -39,6 +39,8 @@
 Requires:      gnome-splash
 Requires:      gnome-wm
 Requires:      libgnomeui >= 2.20.0
+# [EMAIL PROTECTED] vs. [EMAIL PROTECTED]
+Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -108,6 +110,8 @@
 mv ChangeLog main-ChangeLog
 find . -name ChangeLog |awk '{src=$0; 
dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED] ] || \
+       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin}
 %find_lang %{name} --with-gnome --all-name
 
 %clean
@@ -148,6 +152,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.128  2007/11/04 23:57:02  ankry
+- [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 2
+
 Revision 1.127  2007/10/16 17:54:49  megabajt
 - updated to 2.20.1
 

================================================================
Index: SPECS/gnome-spell.spec
diff -u SPECS/gnome-spell.spec:1.34 SPECS/gnome-spell.spec:1.35
--- SPECS/gnome-spell.spec:1.34 Mon Oct 15 19:11:29 2007
+++ SPECS/gnome-spell.spec      Mon Nov  5 00:57:02 2007
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):     GNOME Spell to element GNOME/Bonobo do kontroli pisowni
 Name:          gnome-spell
 Version:       1.0.8
-Release:       1
+Release:       2
 License:       GPL
 Group:         X11/Applications
 Source0:       
http://ftp.gnome.org/pub/gnome/sources/gnome-spell/1.0/%{name}-%{version}.tar.bz2
@@ -15,6 +15,8 @@
 BuildRequires: libglade2-devel >= 2.0.1
 BuildRequires: libgnomeui-devel
 BuildRequires: libtool
+# [EMAIL PROTECTED] vs. [EMAIL PROTECTED]
+Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -60,6 +62,8 @@
        DESTDIR=$RPM_BUILD_ROOT \
        iconsdir=%{_pixmapsdir}
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED] ] || \
+       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin}
 %find_lang %{name}-%{version}
 
 %clean
@@ -86,6 +90,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35  2007/11/04 23:57:02  ankry
+- [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 2
+
 Revision 1.34  2007/10/15 17:11:29  megabajt
 - updated to 1.0.8
 

================================================================
Index: SPECS/gnome-system-monitor.spec
diff -u SPECS/gnome-system-monitor.spec:1.57 
SPECS/gnome-system-monitor.spec:1.58
--- SPECS/gnome-system-monitor.spec:1.57        Wed Oct 17 16:07:37 2007
+++ SPECS/gnome-system-monitor.spec     Mon Nov  5 00:57:02 2007
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):     Prosty monitor procesów
 Name:          gnome-system-monitor
 Version:       2.20.1
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       
http://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/2.20/%{name}-%{version}.tar.bz2
@@ -30,6 +30,8 @@
 Requires:      libgtop >= 1:2.20.0
 Requires:      libwnck >= 2.20.0
 Obsoletes:     procman
+# [EMAIL PROTECTED] vs. [EMAIL PROTECTED]
+Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -61,6 +63,8 @@
        omf_dest_dir=%{_omf_dest_dir}/%{name} \
        GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED] ] || \
+       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin}
 %find_lang %{name} --with-gnome
 
 %clean
@@ -98,6 +102,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.58  2007/11/04 23:57:02  ankry
+- [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 2
+
 Revision 1.57  2007/10/17 14:07:37  megabajt
 - updated to 2.20.1
 

================================================================
Index: SPECS/gnome-terminal.spec
diff -u SPECS/gnome-terminal.spec:1.90 SPECS/gnome-terminal.spec:1.91
--- SPECS/gnome-terminal.spec:1.90      Tue Sep 18 17:33:42 2007
+++ SPECS/gnome-terminal.spec   Mon Nov  5 00:57:02 2007
@@ -16,7 +16,7 @@
 Summary(pl.UTF-8):     Terminal dla GNOME
 Name:          gnome-terminal
 Version:       2.18.2
-Release:       1
+Release:       2
 License:       GPL
 Group:         X11/Applications
 Source0:       
http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/2.18/%{name}-%{version}.tar.bz2
@@ -49,6 +49,8 @@
 Requires:      startup-notification >= 0.8
 Requires:      vte >= 0.16.9
 Requires:      terminfo
+# [EMAIL PROTECTED] vs. [EMAIL PROTECTED]
+Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -93,6 +95,8 @@
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/application-registry
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED] ] || \
+       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin}
 %find_lang %{name} --with-gnome --all-name
 
 %clean
@@ -125,6 +129,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.91  2007/11/04 23:57:02  ankry
+- [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 2
+
 Revision 1.90  2007/09/18 15:33:42  megabajt
 - updated to 2.18.2
 

================================================================
Index: SPECS/gnome-themes.spec
diff -u SPECS/gnome-themes.spec:1.73 SPECS/gnome-themes.spec:1.74
--- SPECS/gnome-themes.spec:1.73        Mon Oct 15 19:05:05 2007
+++ SPECS/gnome-themes.spec     Mon Nov  5 00:57:02 2007
@@ -6,7 +6,7 @@
 Summary(pl.UTF-8):     Domyślne motywy dla środowiska GNOME
 Name:          gnome-themes
 Version:       2.20.1
-Release:       1
+Release:       2
 License:       LGPL
 Group:         Themes
 Source0:       
http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/2.20/%{name}-%{version}.tar.bz2
@@ -33,6 +33,8 @@
 Obsoletes:     gnome-themes-Smokey
 Obsoletes:     gnome-themes-Smokey-Blue
 Obsoletes:     gnome-themes-Smokey-Red
+# [EMAIL PROTECTED] vs. [EMAIL PROTECTED]
+Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -268,6 +270,8 @@
 done
 cd $CD
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED] ] || \
+       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin}
 %find_lang %{name}
 
 # all libs are in gtk2-engines now
@@ -357,6 +361,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.74  2007/11/04 23:57:02  ankry
+- [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 2
+
 Revision 1.73  2007/10/15 17:05:05  megabajt
 - updated to 2.20.1
 

================================================================
Index: SPECS/gnome-vfs2.spec
diff -u SPECS/gnome-vfs2.spec:1.197 SPECS/gnome-vfs2.spec:1.198
--- SPECS/gnome-vfs2.spec:1.197 Mon Sep 17 19:55:14 2007
+++ SPECS/gnome-vfs2.spec       Mon Nov  5 00:57:02 2007
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):     GNOME - wirtualny system plików
 Name:          gnome-vfs2
 Version:       2.20.0
-Release:       1
+Release:       2
 License:       LGPL v2+
 Group:         Applications
 Source0:       
http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.20/gnome-vfs-%{version}.tar.bz2
@@ -49,6 +49,8 @@
 Requires:      shared-mime-info >= 0.18
 Obsoletes:     gnome-vfs-extras
 Obsoletes:     gnome-vfs2-vfolder-menu
+# [EMAIL PROTECTED] vs. [EMAIL PROTECTED]
+Conflicts:     glibc-misc < 6:2.7
 Conflicts:     gnome-vfs2-module-menu <= 0.8-1
 Conflicts:     libgnome < 2.5.1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -154,6 +156,8 @@
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/defaults.list
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED] ] || \
+       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin}
 %find_lang gnome-vfs-2.0
 
 %clean
@@ -220,6 +224,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.198  2007/11/04 23:57:02  ankry
+- [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 2
+
 Revision 1.197  2007/09/17 17:55:14  megabajt
 - updated to 2.20.0
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-nettool.spec?r1=1.22&r2=1.23&f=u
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-panel.spec?r1=1.202&r2=1.203&f=u
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-power-manager.spec?r1=1.51&r2=1.52&f=u
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-screensaver.spec?r1=1.50&r2=1.51&f=u
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-session.spec?r1=1.127&r2=1.128&f=u
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-spell.spec?r1=1.34&r2=1.35&f=u
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-system-monitor.spec?r1=1.57&r2=1.58&f=u
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-terminal.spec?r1=1.90&r2=1.91&f=u
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-themes.spec?r1=1.73&r2=1.74&f=u
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-vfs2.spec?r1=1.197&r2=1.198&f=u

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

Reply via email to