scm-commits January 2009

scm-commits@lists.fedoraproject.org

333 participants
10548 discussions

rpms/ss5/F-9 ss5.sysconfig, NONE, 1.1 import.log, 1.1, 1.2 ss5.spec, 1.8, 1.9
by Itamar Reis Peixoto 31 Jan '09

31 Jan '09

Author: itamarjp Update of /cvs/pkgs/rpms/ss5/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8360/F-9 Modified Files: import.log ss5.spec Added Files: ss5.sysconfig Log Message: include /etc/sysconfig/ss5 file --- NEW FILE ss5.sysconfig --- # 'ss5' can be started with some options (e.g. -b or -s), pass this options via SS5_OPTS SS5_OPTS= Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/ss5/F-9/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 31 Jan 2009 13:58:21 -0000 1.1 +++ import.log 31 Jan 2009 22:34:44 -0000 1.2 @@ -1 +1,2 @@ ss5-3_6_4-2_fc10:F-9:ss5-3.6.4-2.fc10.src.rpm:1233410233 +ss5-3_6_4-3_fc11:F-9:ss5-3.6.4-3.fc11.src.rpm:1233441197 Index: ss5.spec =================================================================== RCS file: /cvs/pkgs/rpms/ss5/F-9/ss5.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ss5.spec 31 Jan 2009 13:58:21 -0000 1.8 +++ ss5.spec 31 Jan 2009 22:34:44 -0000 1.9 @@ -1,16 +1,17 @@ Summary: Socks Server 5 Name: ss5 Version: 3.6.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://sourceforge.net/projects/ss5 -Source: http://prdownloads.sourceforge.net/ss5/ss5-%{version}-3.tar.gz +Source0: http://prdownloads.sourceforge.net/ss5/ss5-%{version}-3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openldap-devel pam-devel Requires(post): chkconfig Requires(preun): chkconfig, initscripts +Source1: ss5.sysconfig Patch0: ss5_init.patch %description @@ -30,6 +31,8 @@ make install prefix=$RPM_BUILD_ROOT +install -Dpm 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/ss5 + chmod -R +r $RPM_BUILD_ROOT %clean @@ -49,6 +52,7 @@ %{_sbindir}/ss5 %{_initrddir}/ss5 %{_libdir}/ss5/ +%config(noreplace) %{_sysconfdir}/sysconfig/ss5 %dir %{_docdir}/ss5 %{_docdir}/ss5/License @@ -76,6 +80,9 @@ %doc ChangeLog %changelog +* Wed Jan 31 2009 Itamar Reis Peixoto <itamar(a)ispbrasil.com.br> - 3.6.4-3 +- include /etc/sysconfig/ss5 file + * Wed Jan 28 2009 Itamar Reis Peixoto <itamar(a)ispbrasil.com.br> - 3.6.4-2 - fix init script BZ #478702 - replace some tabs with spaces in changelog

1 0

rpms/ss5/F-10 ss5.sysconfig, NONE, 1.1 import.log, 1.1, 1.2 ss5.spec, 1.9, 1.10
by Itamar Reis Peixoto 31 Jan '09

31 Jan '09

Author: itamarjp Update of /cvs/pkgs/rpms/ss5/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7688/F-10 Modified Files: import.log ss5.spec Added Files: ss5.sysconfig Log Message: include /etc/sysconfig/ss5 file --- NEW FILE ss5.sysconfig --- # 'ss5' can be started with some options (e.g. -b or -s), pass this options via SS5_OPTS SS5_OPTS= Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/ss5/F-10/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Jan 2009 06:08:48 -0000 1.1 +++ import.log 31 Jan 2009 22:31:21 -0000 1.2 @@ -1 +1,2 @@ ss5-3_6_4-2_fc11:F-10:ss5-3.6.4-2.fc11.src.rpm:1233122875 +ss5-3_6_4-3_fc11:F-10:ss5-3.6.4-3.fc11.src.rpm:1233440983 Index: ss5.spec =================================================================== RCS file: /cvs/pkgs/rpms/ss5/F-10/ss5.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ss5.spec 28 Jan 2009 06:08:48 -0000 1.9 +++ ss5.spec 31 Jan 2009 22:31:21 -0000 1.10 @@ -1,16 +1,17 @@ Summary: Socks Server 5 Name: ss5 Version: 3.6.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://sourceforge.net/projects/ss5 -Source: http://prdownloads.sourceforge.net/ss5/ss5-%{version}-3.tar.gz +Source0: http://prdownloads.sourceforge.net/ss5/ss5-%{version}-3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openldap-devel pam-devel Requires(post): chkconfig Requires(preun): chkconfig, initscripts +Source1: ss5.sysconfig Patch0: ss5_init.patch %description @@ -30,6 +31,8 @@ make install prefix=$RPM_BUILD_ROOT +install -Dpm 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/ss5 + chmod -R +r $RPM_BUILD_ROOT %clean @@ -49,6 +52,7 @@ %{_sbindir}/ss5 %{_initrddir}/ss5 %{_libdir}/ss5/ +%config(noreplace) %{_sysconfdir}/sysconfig/ss5 %dir %{_docdir}/ss5 %{_docdir}/ss5/License @@ -76,6 +80,9 @@ %doc ChangeLog %changelog +* Wed Jan 31 2009 Itamar Reis Peixoto <itamar(a)ispbrasil.com.br> - 3.6.4-3 +- include /etc/sysconfig/ss5 file + * Wed Jan 28 2009 Itamar Reis Peixoto <itamar(a)ispbrasil.com.br> - 3.6.4-2 - fix init script BZ #478702 - replace some tabs with spaces in changelog

1 0

rpms/ss5/devel ss5.sysconfig, NONE, 1.1 import.log, 1.2, 1.3 ss5.spec, 1.9, 1.10
by Itamar Reis Peixoto 31 Jan '09

31 Jan '09

Author: itamarjp Update of /cvs/pkgs/rpms/ss5/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7014/devel Modified Files: import.log ss5.spec Added Files: ss5.sysconfig Log Message: include /etc/sysconfig/ss5 file --- NEW FILE ss5.sysconfig --- # 'ss5' can be started with some options (e.g. -b or -s), pass this options via SS5_OPTS SS5_OPTS= Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/ss5/devel/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 31 Jan 2009 13:52:26 -0000 1.2 +++ import.log 31 Jan 2009 22:28:30 -0000 1.3 @@ -1,2 +1,3 @@ ss5-3_6_4-2_fc9:HEAD:ss5-3.6.4-2.fc9.src.rpm:1233115244 ss5-3_6_4-2_fc10:HEAD:ss5-3.6.4-2.fc10.src.rpm:1233409811 +ss5-3_6_4-3_fc11:HEAD:ss5-3.6.4-3.fc11.src.rpm:1233440808 Index: ss5.spec =================================================================== RCS file: /cvs/pkgs/rpms/ss5/devel/ss5.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ss5.spec 28 Jan 2009 04:19:12 -0000 1.9 +++ ss5.spec 31 Jan 2009 22:28:30 -0000 1.10 @@ -1,16 +1,17 @@ Summary: Socks Server 5 Name: ss5 Version: 3.6.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://sourceforge.net/projects/ss5 -Source: http://prdownloads.sourceforge.net/ss5/ss5-%{version}-3.tar.gz +Source0: http://prdownloads.sourceforge.net/ss5/ss5-%{version}-3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openldap-devel pam-devel Requires(post): chkconfig Requires(preun): chkconfig, initscripts +Source1: ss5.sysconfig Patch0: ss5_init.patch %description @@ -30,6 +31,8 @@ make install prefix=$RPM_BUILD_ROOT +install -Dpm 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/ss5 + chmod -R +r $RPM_BUILD_ROOT %clean @@ -49,6 +52,7 @@ %{_sbindir}/ss5 %{_initrddir}/ss5 %{_libdir}/ss5/ +%config(noreplace) %{_sysconfdir}/sysconfig/ss5 %dir %{_docdir}/ss5 %{_docdir}/ss5/License @@ -76,6 +80,9 @@ %doc ChangeLog %changelog +* Wed Jan 31 2009 Itamar Reis Peixoto <itamar(a)ispbrasil.com.br> - 3.6.4-3 +- include /etc/sysconfig/ss5 file + * Wed Jan 28 2009 Itamar Reis Peixoto <itamar(a)ispbrasil.com.br> - 3.6.4-2 - fix init script BZ #478702 - replace some tabs with spaces in changelog

1 0

rpms/ldm/F-9 .cvsignore, 1.23, 1.24 ldm.spec, 1.32, 1.33 sources, 1.27, 1.28 ldm-2.0.30-nbd-update.patch, 1.1, NONE
by Ryan Niebur 31 Jan '09

31 Jan '09

Author: ryan52 Update of /cvs/pkgs/rpms/ldm/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6737 Modified Files: .cvsignore ldm.spec sources Removed Files: ldm-2.0.30-nbd-update.patch Log Message: new version, merged from devel Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ldm/F-9/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 22 Jan 2009 05:18:54 -0000 1.23 +++ .cvsignore 31 Jan 2009 22:26:19 -0000 1.24 @@ -1,2 +1,2 @@ k12linux-theme-1.0.2.tar.bz2 -ldm-2.0.30.tar.bz2 +ldm-2.0.31.tar.bz2 Index: ldm.spec =================================================================== RCS file: /cvs/pkgs/rpms/ldm/F-9/ldm.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- ldm.spec 28 Jan 2009 22:48:36 -0000 1.32 +++ ldm.spec 31 Jan 2009 22:26:19 -0000 1.33 @@ -1,15 +1,14 @@ Name: ldm -Version: 2.0.30 +Version: 2.0.31 %define _datestamp .20090127.13 -#Release: 2%{_datestamp}%{?dist} -Release: 2%{?dist} +#Release: 1%{_datestamp}%{?dist} +Release: 1%{?dist} Summary: LTSP Display Manager Group: User Interface/X License: GPLv2+ URL: https://code.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk Source0: ldm-%{version}.tar.bz2 -Patch0: ldm-2.0.30-nbd-update.patch # Artwork by Maureen Duffy <duffy(a)redhat.com> %define theme_version 1.0.2 Source1: k12linux-theme-%{theme_version}.tar.bz2 @@ -18,6 +17,8 @@ BuildRequires: gtk2-devel BuildRequires: gettext-devel BuildRequires: intltool +BuildRequires: iso-codes +BuildRequires: python Requires: nc Requires: openssh-clients @@ -35,7 +36,6 @@ %prep %setup -q -%patch0 -p1 %build @@ -95,6 +95,10 @@ %config(noreplace) %{_sysconfdir}/ltsp/ldm-global-dmrc %changelog +* Sat Jan 31 2009 Ryan Niebur <ryanryan52(a)gmail.com> - 2.0.31-1 +- show the languages in a user friendly way in the language chooser +- race condition fix + * Wed Jan 28 2009 Warren Togami <wtogami(a)redhat.com> - 2.0.30-2 - Fix nbd update checker Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ldm/F-9/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 22 Jan 2009 05:18:54 -0000 1.27 +++ sources 31 Jan 2009 22:26:19 -0000 1.28 @@ -1,2 +1,2 @@ 620e0ae9f5db3c40ade7e17681b97a08 k12linux-theme-1.0.2.tar.bz2 -1fcfcf63c7b11d9e1c041494f8bfe88b ldm-2.0.30.tar.bz2 +7aa083ae5ab8130ac4e42af7e2b61456 ldm-2.0.31.tar.bz2 --- ldm-2.0.30-nbd-update.patch DELETED ---

1 0

rpms/ldm/F-10 .cvsignore, 1.17, 1.18 ldm.spec, 1.27, 1.28 sources, 1.21, 1.22 ldm-2.0.30-nbd-update.patch, 1.1, NONE
by Ryan Niebur 31 Jan '09

31 Jan '09

Author: ryan52 Update of /cvs/pkgs/rpms/ldm/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6264 Modified Files: .cvsignore ldm.spec sources Removed Files: ldm-2.0.30-nbd-update.patch Log Message: new version, merged from devel Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ldm/F-10/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 22 Jan 2009 05:17:03 -0000 1.17 +++ .cvsignore 31 Jan 2009 22:23:39 -0000 1.18 @@ -1,2 +1,2 @@ k12linux-theme-1.0.2.tar.bz2 -ldm-2.0.30.tar.bz2 +ldm-2.0.31.tar.bz2 Index: ldm.spec =================================================================== RCS file: /cvs/pkgs/rpms/ldm/F-10/ldm.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- ldm.spec 28 Jan 2009 22:43:11 -0000 1.27 +++ ldm.spec 31 Jan 2009 22:23:39 -0000 1.28 @@ -1,15 +1,14 @@ Name: ldm -Version: 2.0.30 +Version: 2.0.31 %define _datestamp .20090127.13 -#Release: 2%{_datestamp}%{?dist} -Release: 2%{?dist} +#Release: 1%{_datestamp}%{?dist} +Release: 1%{?dist} Summary: LTSP Display Manager Group: User Interface/X License: GPLv2+ URL: https://code.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk Source0: ldm-%{version}.tar.bz2 -Patch0: ldm-2.0.30-nbd-update.patch # Artwork by Maureen Duffy <duffy(a)redhat.com> %define theme_version 1.0.2 Source1: k12linux-theme-%{theme_version}.tar.bz2 @@ -18,6 +17,8 @@ BuildRequires: gtk2-devel BuildRequires: gettext-devel BuildRequires: intltool +BuildRequires: iso-codes +BuildRequires: python Requires: nc Requires: openssh-clients @@ -35,7 +36,6 @@ %prep %setup -q -%patch0 -p1 %build @@ -95,6 +95,10 @@ %config(noreplace) %{_sysconfdir}/ltsp/ldm-global-dmrc %changelog +* Sat Jan 31 2009 Ryan Niebur <ryanryan52(a)gmail.com> - 2.0.31-1 +- show the languages in a user friendly way in the language chooser +- race condition fix + * Wed Jan 28 2009 Warren Togami <wtogami(a)redhat.com> - 2.0.30-2 - Fix nbd update checker Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ldm/F-10/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 22 Jan 2009 05:17:03 -0000 1.21 +++ sources 31 Jan 2009 22:23:39 -0000 1.22 @@ -1,2 +1,2 @@ 620e0ae9f5db3c40ade7e17681b97a08 k12linux-theme-1.0.2.tar.bz2 -1fcfcf63c7b11d9e1c041494f8bfe88b ldm-2.0.30.tar.bz2 +7aa083ae5ab8130ac4e42af7e2b61456 ldm-2.0.31.tar.bz2 --- ldm-2.0.30-nbd-update.patch DELETED ---

1 0

rpms/ctan-kerkis-fonts/devel ctan-kerkis-fonts.spec,1.2,1.3
by Sarantis Paskalis 31 Jan '09

31 Jan '09

Author: sarantis Update of /cvs/extras/rpms/ctan-kerkis-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4847 Modified Files: ctan-kerkis-fonts.spec Log Message: add forgotten requires on -common Index: ctan-kerkis-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/ctan-kerkis-fonts/devel/ctan-kerkis-fonts.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ctan-kerkis-fonts.spec 30 Jan 2009 22:38:42 -0000 1.2 +++ ctan-kerkis-fonts.spec 31 Jan 2009 22:14:57 -0000 1.3 @@ -15,7 +15,7 @@ Name: ctan-kerkis-fonts Version: 2.0 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Kerkis Type 1 fonts Group: Applications/Publishing License: LPPL @@ -45,6 +45,7 @@ %package -n %{seriffonts} Summary: Kerkis serif Type1 fonts Group: User Interface/X +Requires: %{name}-common = %{version}-%{release} %description -n %{seriffonts} %{common_desc} This package contains the Kerkis font family. It is based on the URW Bookman @@ -57,6 +58,7 @@ %package -n %{sansfonts} Summary: KerkisSans Type1 fonts Group: User Interface/X +Requires: %{name}-common = %{version}-%{release} %description -n %{sansfonts} %{common_desc} This package contains the KerkisSans font family, based on a free version @@ -69,6 +71,7 @@ %package -n %{calligraphicfonts} Summary: Kerkis Calligraphic Type1 fonts Group: User Interface/X +Requires: %{name}-common = %{version}-%{release} %description -n %{calligraphicfonts} %{common_desc} This package contains the Kerkis-Calligraphic font family, a calligraphic font @@ -185,6 +188,9 @@ %changelog +* Sun Feb 1 2009 Sarantis Paskalis <paskalis(a)di.uoa.gr> - 2.0-20 +- Also add forgotten requires on -common. + * Sat Jan 31 2009 Sarantis Paskalis <paskalis(a)di.uoa.gr> - 2.0-19 - Add forgotten %%{_fontdir} in %%files section in -common (bz #483333)

1 0

rpms/ldm/devel ldm.spec,1.19,1.20
by Ryan Niebur 31 Jan '09

31 Jan '09

Author: ryan52 Update of /cvs/pkgs/rpms/ldm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4571 Modified Files: ldm.spec Log Message: it's Saturday, not Wednesday.. Index: ldm.spec =================================================================== RCS file: /cvs/pkgs/rpms/ldm/devel/ldm.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- ldm.spec 31 Jan 2009 22:11:09 -0000 1.19 +++ ldm.spec 31 Jan 2009 22:13:32 -0000 1.20 @@ -95,7 +95,7 @@ %config(noreplace) %{_sysconfdir}/ltsp/ldm-global-dmrc %changelog -* Wed Jan 31 2009 Ryan Niebur <ryanryan52(a)gmail.com> - 2.0.31-1 +* Sat Jan 31 2009 Ryan Niebur <ryanryan52(a)gmail.com> - 2.0.31-1 - show the languages in a user friendly way in the language chooser - race condition fix

1 0

rpms/ldm/devel ldm.spec,1.18,1.19
by Ryan Niebur 31 Jan '09

31 Jan '09

Author: ryan52 Update of /cvs/pkgs/rpms/ldm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4182 Modified Files: ldm.spec Log Message: use the real version Index: ldm.spec =================================================================== RCS file: /cvs/pkgs/rpms/ldm/devel/ldm.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ldm.spec 31 Jan 2009 22:04:03 -0000 1.18 +++ ldm.spec 31 Jan 2009 22:11:09 -0000 1.19 @@ -1,8 +1,8 @@ Name: ldm Version: 2.0.31 %define _datestamp .20090127.13 -Release: 1%{_datestamp}%{?dist} -#Release: 1%{?dist} +#Release: 1%{_datestamp}%{?dist} +Release: 1%{?dist} Summary: LTSP Display Manager Group: User Interface/X

1 0

rpms/ldm/devel .cvsignore, 1.9, 1.10 ldm.spec, 1.17, 1.18 sources, 1.13, 1.14 ldm-rearrange-stuff.patch, 1.2, NONE
by Ryan Niebur 31 Jan '09

31 Jan '09

Author: ryan52 Update of /cvs/pkgs/rpms/ldm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2465 Modified Files: .cvsignore ldm.spec sources Removed Files: ldm-rearrange-stuff.patch Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ldm/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 31 Oct 2008 21:20:24 -0000 1.9 +++ .cvsignore 31 Jan 2009 22:04:03 -0000 1.10 @@ -1,2 +1,2 @@ -ldm-k12linux-theme-1.0.1.tar.bz2 -ldm-2.0.16.tar.bz2 +k12linux-theme-1.0.2.tar.bz2 +ldm-2.0.31.tar.bz2 Index: ldm.spec =================================================================== RCS file: /cvs/pkgs/rpms/ldm/devel/ldm.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ldm.spec 31 Jan 2009 22:00:43 -0000 1.17 +++ ldm.spec 31 Jan 2009 22:04:03 -0000 1.18 @@ -1,15 +1,14 @@ Name: ldm -Version: 2.0.30 +Version: 2.0.31 %define _datestamp .20090127.13 -#Release: 2%{_datestamp}%{?dist} -Release: 2%{?dist} +Release: 1%{_datestamp}%{?dist} +#Release: 1%{?dist} Summary: LTSP Display Manager Group: User Interface/X License: GPLv2+ URL: https://code.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk Source0: ldm-%{version}.tar.bz2 -Patch0: ldm-2.0.30-nbd-update.patch # Artwork by Maureen Duffy <duffy(a)redhat.com> %define theme_version 1.0.2 Source1: k12linux-theme-%{theme_version}.tar.bz2 @@ -18,6 +17,8 @@ BuildRequires: gtk2-devel BuildRequires: gettext-devel BuildRequires: intltool +BuildRequires: iso-codes +BuildRequires: python Requires: nc Requires: openssh-clients @@ -35,7 +36,6 @@ %prep %setup -q -%patch0 -p1 %build @@ -95,6 +95,10 @@ %config(noreplace) %{_sysconfdir}/ltsp/ldm-global-dmrc %changelog +* Wed Jan 31 2009 Ryan Niebur <ryanryan52(a)gmail.com> - 2.0.31-1 +- show the languages in a user friendly way in the language chooser +- race condition fix + * Wed Jan 28 2009 Warren Togami <wtogami(a)redhat.com> - 2.0.30-2 - Fix nbd update checker Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ldm/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 31 Oct 2008 21:20:24 -0000 1.13 +++ sources 31 Jan 2009 22:04:03 -0000 1.14 @@ -1,2 +1,2 @@ -5b2cbbad73c92f47c65733ff181705cc ldm-k12linux-theme-1.0.1.tar.bz2 -31214d1394711340f2c5a6a18f36cc8d ldm-2.0.16.tar.bz2 +620e0ae9f5db3c40ade7e17681b97a08 k12linux-theme-1.0.2.tar.bz2 +7aa083ae5ab8130ac4e42af7e2b61456 ldm-2.0.31.tar.bz2 --- ldm-rearrange-stuff.patch DELETED ---

1 0

rpms/ldm/devel ldm.spec,1.16,1.17
by Ryan Niebur 31 Jan '09

31 Jan '09

Author: ryan52 Update of /cvs/pkgs/rpms/ldm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1852 Modified Files: ldm.spec Log Message: merge changes from F-10 Index: ldm.spec =================================================================== RCS file: /cvs/pkgs/rpms/ldm/devel/ldm.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ldm.spec 31 Oct 2008 21:20:24 -0000 1.16 +++ ldm.spec 31 Jan 2009 22:00:43 -0000 1.17 @@ -1,17 +1,18 @@ Name: ldm -Version: 2.0.16 -%define _datestamp .20081030.15 +Version: 2.0.30 +%define _datestamp .20090127.13 #Release: 2%{_datestamp}%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} Summary: LTSP Display Manager Group: User Interface/X License: GPLv2+ URL: https://code.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk Source0: ldm-%{version}.tar.bz2 +Patch0: ldm-2.0.30-nbd-update.patch # Artwork by Maureen Duffy <duffy(a)redhat.com> -Source1: ldm-k12linux-theme-1.0.1.tar.bz2 -Patch0: ldm-rearrange-stuff.patch +%define theme_version 1.0.2 +Source1: k12linux-theme-%{theme_version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel @@ -38,6 +39,7 @@ %build +export CFLAGS="$CFLAGS -DK12LINUX" %configure make %{?_smp_mflags} @@ -47,7 +49,7 @@ make install DESTDIR=$RPM_BUILD_ROOT cd $RPM_BUILD_ROOT/%{_datadir}/ldm/themes tar xfvj %SOURCE1 - mv ldm-k12linux-theme-1.0.1 k12linux + mv k12linux-theme-%{theme_version} k12linux ln -s k12linux default cd - @@ -59,12 +61,27 @@ install -m 0755 ldminfod/ldminfod $RPM_BUILD_ROOT%{_sbindir}/ldminfod install -m 0644 ldminfod/xinetd.d/ldminfod $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ldminfod +rm -rf $RPM_BUILD_ROOT%{_datadir}/ldm/themes/ltsp + +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ltsp +cat > $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/ldm-global-dmrc <<EOL +[Desktop] +#Session=gnome +#Session=kde +#Session=xfce4 +#Session=sugar +#Language=ja_JP.utf8 +#Language=en_US.utf8 +EOL +chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/ldm-global-dmrc + %clean rm -rf $RPM_BUILD_ROOT %files -f ldm.lang %defattr(-,root,root,-) %doc COPYING README +%{_bindir}/ldm-dialog %{_sbindir}/ldm %{_libexecdir}/ldm/ %{_datadir}/ldm/ @@ -75,9 +92,40 @@ %files -n ldminfod %{_sbindir}/ldminfod %config(noreplace) %{_sysconfdir}/xinetd.d/ldminfod +%config(noreplace) %{_sysconfdir}/ltsp/ldm-global-dmrc %changelog -* Fri Oct 31 2008 Warren Togami <wtogami(a)redhat.com. - 2.0.16-1 +* Wed Jan 28 2009 Warren Togami <wtogami(a)redhat.com> - 2.0.30-2 +- Fix nbd update checker + +* Wed Jan 22 2009 Warren Togami <wtogami(a)redhat.com> - 2.0.30-1 +- NBD update checker, reboots client automatically if needed + +* Wed Dec 24 2008 Warren Togami <wtogami(a)redhat.com> - 2.0.27-1 +- More bug fixes + +* Thu Dec 12 2008 Warren Togami <wtogami(a)redhat.com> - 2.0.25-1 +- More bug fixes + +* Fri Dec 12 2008 Warren Togami <wtogami(a)redhat.com> - 2.0.24-1 +- Minor bug fixes + +* Fri Dec 12 2008 Warren Togami <wtogami(a)redhat.com> - 2.0.23-1 +- LDM_DIRECTX=true was broken, now fixed + +* Thu Dec 11 2008 Warren Togami <wtogami(a)redhat.com> - 2.0.22-1 +- Show good names in Session menu +- Use and write to user .dmrc + It is now possible to set a default session that is not GNOME. + Set LDM_GLOBAL_DMRC=/etc/ltsp/ldm-global-dmrc in lts.conf + and specify your choice in /etc/ltsp/ldm-global-dmrc on the server. + +* Thu Nov 13 2008 Warren Togami <wtogami(a)redhat.com> - 2.0.18-1 +- Fix race condition in a clean way without the ugly hack. +- Improve logging. +- Many little bug fixes and code cleanups. + +* Fri Oct 31 2008 Warren Togami <wtogami(a)redhat.com> - 2.0.16-1 - UGLY HACK: Workaround race condition where keyboard layout setting would often fail because it was being set before X was done initializing.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits January 2009