rpms/dejavu-fonts import.log,1.2,1.3
by fedora-extras-commits@redhat.com
Author: nim
Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1651
Modified Files:
import.log
Log Message:
auto-import dejavu-fonts-1.12-1 on branch devel from dejavu-fonts-1.12-1.src.rpm
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log 23 Jun 2005 19:10:11 -0000 1.2
+++ import.log 31 Jul 2005 14:25:47 -0000 1.3
@@ -1 +1,2 @@
dejavu-fonts-1_11-1:HEAD:dejavu-fonts-1.11-1.src.rpm:1119553802
+dejavu-fonts-1_12-1:HEAD:dejavu-fonts-1.12-1.src.rpm:1122819936
18 years, 8 months
rpms/blacs/devel blacs.spec,1.13,1.14
by fedora-extras-commits@redhat.com
Author: spot
Update of /cvs/extras/rpms/blacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32740/devel
Modified Files:
blacs.spec
Log Message:
fix FC-3 spec file
Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- blacs.spec 30 Jul 2005 02:31:36 -0000 1.13
+++ blacs.spec 31 Jul 2005 13:51:40 -0000 1.14
@@ -1,7 +1,7 @@
Summary: Basic Linear Algebra Communication Subprograms
Name: blacs
Version: 1.1
-Release: 16%{?dist}
+Release: 17%{?dist}
License: Freely distributable
Group: Development/Libraries
URL: http://www.netlib.org/blacs
@@ -107,6 +107,9 @@
%{_libdir}/libmpiblacs*.so
%changelog
+* Sun Jul 31 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 1.1-17
+- fix g77 for FC-3 spec
+
* Fri Jul 29 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 1.1-16
- remove ppc hack
18 years, 8 months
rpms/blacs/FC-4 blacs.spec,1.13,1.14
by fedora-extras-commits@redhat.com
Author: spot
Update of /cvs/extras/rpms/blacs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32740/FC-4
Modified Files:
blacs.spec
Log Message:
fix FC-3 spec file
Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- blacs.spec 30 Jul 2005 02:31:30 -0000 1.13
+++ blacs.spec 31 Jul 2005 13:51:39 -0000 1.14
@@ -1,7 +1,7 @@
Summary: Basic Linear Algebra Communication Subprograms
Name: blacs
Version: 1.1
-Release: 16%{?dist}
+Release: 17%{?dist}
License: Freely distributable
Group: Development/Libraries
URL: http://www.netlib.org/blacs
@@ -107,6 +107,9 @@
%{_libdir}/libmpiblacs*.so
%changelog
+* Sun Jul 31 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 1.1-17
+- fix g77 for FC-3 spec
+
* Fri Jul 29 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 1.1-16
- remove ppc hack
18 years, 8 months
rpms/blacs/FC-3 blacs.spec,1.13,1.14
by fedora-extras-commits@redhat.com
Author: spot
Update of /cvs/extras/rpms/blacs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32740/FC-3
Modified Files:
blacs.spec
Log Message:
fix FC-3 spec file
Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- blacs.spec 30 Jul 2005 02:31:30 -0000 1.13
+++ blacs.spec 31 Jul 2005 13:51:39 -0000 1.14
@@ -1,7 +1,7 @@
Summary: Basic Linear Algebra Communication Subprograms
Name: blacs
Version: 1.1
-Release: 16%{?dist}
+Release: 17%{?dist}
License: Freely distributable
Group: Development/Libraries
URL: http://www.netlib.org/blacs
@@ -15,7 +15,7 @@
Source7: http://www.netlib.org/blacs/cblacsqref.ps
Source8: http://www.netlib.org/blacs/lawn94.ps
Source9: Bmake.inc.64bit
-BuildRequires: gcc-gfortran
+BuildRequires: gcc-g77
# Lam before 7.1.1-5 is missing:
# -shared library support
# -fPIC compilation flag
@@ -107,6 +107,9 @@
%{_libdir}/libmpiblacs*.so
%changelog
+* Sun Jul 31 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 1.1-17
+- fix g77 for FC-3 spec
+
* Fri Jul 29 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 1.1-16
- remove ppc hack
18 years, 8 months
common tobuild,1.2167,1.2168
by fedora-extras-commits@redhat.com
Author: scop
Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29787
Modified Files:
tobuild
Log Message:
Clean up some successful builds.
Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2167
retrieving revision 1.2168
diff -u -r1.2167 -r1.2168
--- tobuild 30 Jul 2005 07:04:56 -0000 1.2167
+++ tobuild 31 Jul 2005 11:17:32 -0000 1.2168
@@ -20,13 +20,6 @@
thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel
thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel
icon rpms/libxml++/devel libxml++-2_10_0-1_fc5 devel
-scop rpms/lft/devel lft-2_31-3 devel
-scop rpms/dvb-apps/devel dvb-apps-1_1_0-1_fc5 devel
-scop rpms/gdome2/devel gdome2-0_8_1-1_fc5 devel
-scop rpms/rpmlint/devel rpmlint-0_70-4_fc5 devel
-scop rpms/bash-completion/devel bash-completion-20050721-1_fc5 devel
-scop rpms/perl-ExtUtils-XSBuilder/devel perl-ExtUtils-XSBuilder-0_27-2_fc5 devel
-scop rpms/libapreq2/FC-4 libapreq2-2_06-1_fc4 fc4
scop rpms/libapreq2/devel libapreq2-2_06-1_fc5 devel
abompard rpms/ulogd/devel ulogd-1_23-2_fc5 devel
abompard rpms/showimg/devel showimg-0_9_4_1-4_fc5 devel
18 years, 8 months
rpms/sylpheed-claws/devel .cvsignore, 1.7, 1.8 sources, 1.8, 1.9 sylpheed-claws.spec, 1.17, 1.18
by fedora-extras-commits@redhat.com
Author: awjb
Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28444
Modified Files:
.cvsignore sources sylpheed-claws.spec
Log Message:
- upgrade to 1.9.13
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 6 Jul 2005 07:42:42 -0000 1.7
+++ .cvsignore 31 Jul 2005 10:16:28 -0000 1.8
@@ -1 +1 @@
-sylpheed-claws-1.9.12.tar.bz2
+sylpheed-claws-1.9.13.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 6 Jul 2005 07:42:42 -0000 1.8
+++ sources 31 Jul 2005 10:16:28 -0000 1.9
@@ -1 +1 @@
-c7cdfe6ac9afacd680cb8fe58eb9da79 sylpheed-claws-1.9.12.tar.bz2
+afd3b82ca210520f0ad241b77c5e673a sylpheed-claws-1.9.13.tar.bz2
Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sylpheed-claws.spec 7 Jul 2005 10:22:37 -0000 1.17
+++ sylpheed-claws.spec 31 Jul 2005 10:16:28 -0000 1.18
@@ -1,13 +1,13 @@
%define openssl_pc %(if test -z `rpm -ql openssl-devel | grep pkgconfig` ; then echo 0; else echo 1; fi )
Name: sylpheed-claws
-Version: 1.9.12
-Release: 2%{?dist}
+Version: 1.9.13
+Release: 1%{?dist}
Summary: The bleeding edge branch of Sylpheed
Group: Applications/Internet
License: GPL
URL: http://claws.sylpheed.org
-Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-1.9.12.tar.bz2
+Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-1.9.13.tar.bz2
Source1: sylpheed-claws.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: flex, bison
@@ -20,10 +20,11 @@
BuildRequires: pilot-link-devel
BuildRequires: gdk-pixbuf-devel
BuildRequires: clamav-devel
-BuildRequires: gnupg >= 1.2.1, gpgme03-devel >= 0.3.16-8
+BuildRequires: gnupg >= 1.2.1, gpgme-devel >= 0.4.5
BuildRequires: desktop-file-utils startup-notification-devel
BuildRequires: pkgconfig
BuildRequires: gettext-devel
+BuildRequires: libetpan-devel
Requires: spamassassin
Requires: dillo
@@ -57,14 +58,11 @@
--disable-mathml-viewer-plugin \
--enable-aspell \
--disable-dependency-tracking \
- --with-gpgme-prefix=%{_libdir}/gpgme03 \
--program-suffix="-claws"
%{__make} %{?_smp_mflags}
-
%{__make} check
-
%install
%{__rm} -rf ${RPM_BUILD_ROOT}
%makeinstall gnomedatadir=${RPM_BUILD_ROOT}/%{_datadir}
@@ -83,11 +81,9 @@
%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
-%{__install} %{_builddir}/%{name}-%{version}/sylpheed.png \
+%{__install} %{_builddir}/%{name}-%{version}/sylpheed-claws.png \
${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
-%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/sylpheed{,-claws}.png
-
%clean
%{__rm} -rf ${RPM_BUILD_ROOT}
@@ -113,8 +109,15 @@
%dir %{_includedir}/sylpheed-claws/
%{_includedir}/sylpheed-claws/*
%{_libdir}/pkgconfig/sylpheed-claws.pc
+%{_libdir}/sylpheed-claws/plugins/*deps
%changelog
+* Sun Jul 31 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.9.13-1
+- upgrade
+- switch s/gpgme03/gpgme/
+- need libetpan
+
* Thu Jul 07 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
1.9.12-2
- add some doc
18 years, 8 months
rpms/sylpheed-claws/FC-4 .cvsignore, 1.7, 1.8 sources, 1.8, 1.9 sylpheed-claws.spec, 1.17, 1.18
by fedora-extras-commits@redhat.com
Author: awjb
Update of /cvs/extras/rpms/sylpheed-claws/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28409
Modified Files:
.cvsignore sources sylpheed-claws.spec
Log Message:
- upgrade to 1.9.13
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 6 Jul 2005 07:41:46 -0000 1.7
+++ .cvsignore 31 Jul 2005 10:15:10 -0000 1.8
@@ -1 +1 @@
-sylpheed-claws-1.9.12.tar.bz2
+sylpheed-claws-1.9.13.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 6 Jul 2005 07:41:46 -0000 1.8
+++ sources 31 Jul 2005 10:15:10 -0000 1.9
@@ -1 +1 @@
-c7cdfe6ac9afacd680cb8fe58eb9da79 sylpheed-claws-1.9.12.tar.bz2
+afd3b82ca210520f0ad241b77c5e673a sylpheed-claws-1.9.13.tar.bz2
Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sylpheed-claws.spec 7 Jul 2005 10:20:35 -0000 1.17
+++ sylpheed-claws.spec 31 Jul 2005 10:15:10 -0000 1.18
@@ -1,13 +1,13 @@
%define openssl_pc %(if test -z `rpm -ql openssl-devel | grep pkgconfig` ; then echo 0; else echo 1; fi )
Name: sylpheed-claws
-Version: 1.9.12
-Release: 2%{?dist}
+Version: 1.9.13
+Release: 1%{?dist}
Summary: The bleeding edge branch of Sylpheed
Group: Applications/Internet
License: GPL
URL: http://claws.sylpheed.org
-Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-1.9.12.tar.bz2
+Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-1.9.13.tar.bz2
Source1: sylpheed-claws.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: flex, bison
@@ -20,10 +20,11 @@
BuildRequires: pilot-link-devel
BuildRequires: gdk-pixbuf-devel
BuildRequires: clamav-devel
-BuildRequires: gnupg >= 1.2.1, gpgme03-devel >= 0.3.16-8
+BuildRequires: gnupg >= 1.2.1, gpgme-devel >= 0.4.5
BuildRequires: desktop-file-utils startup-notification-devel
BuildRequires: pkgconfig
BuildRequires: gettext-devel
+BuildRequires: libetpan-devel
Requires: spamassassin
Requires: dillo
@@ -57,14 +58,11 @@
--disable-mathml-viewer-plugin \
--enable-aspell \
--disable-dependency-tracking \
- --with-gpgme-prefix=%{_libdir}/gpgme03 \
--program-suffix="-claws"
%{__make} %{?_smp_mflags}
-
%{__make} check
-
%install
%{__rm} -rf ${RPM_BUILD_ROOT}
%makeinstall gnomedatadir=${RPM_BUILD_ROOT}/%{_datadir}
@@ -83,11 +81,9 @@
%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
-%{__install} %{_builddir}/%{name}-%{version}/sylpheed.png \
+%{__install} %{_builddir}/%{name}-%{version}/sylpheed-claws.png \
${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
-%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/sylpheed{,-claws}.png
-
%clean
%{__rm} -rf ${RPM_BUILD_ROOT}
@@ -113,8 +109,15 @@
%dir %{_includedir}/sylpheed-claws/
%{_includedir}/sylpheed-claws/*
%{_libdir}/pkgconfig/sylpheed-claws.pc
+%{_libdir}/sylpheed-claws/plugins/*deps
%changelog
+* Sun Jul 31 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.9.13-1
+- upgrade
+- switch s/gpgme03/gpgme/
+- need libetpan
+
* Thu Jul 07 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
1.9.12-2
- add some doc
18 years, 8 months
rpms/scim-anthy/FC-4 scim-anthy.spec,1.16,1.17
by fedora-extras-commits@redhat.com
Author: petersen
Update of /cvs/extras/rpms/scim-anthy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19521
Modified Files:
scim-anthy.spec
Log Message:
fixup changelog
Index: scim-anthy.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- scim-anthy.spec 31 Jul 2005 01:40:59 -0000 1.16
+++ scim-anthy.spec 31 Jul 2005 06:53:50 -0000 1.17
@@ -65,10 +65,9 @@
- count scim-ja_JP providers before removing xinput.d alternative
* Fri Jul 29 2005 Ryo Dairiki <ryo-dairiki(a)mbm.nifty.com>
-- add xinput.d alternatives setup in %%post and %%po
-stun
+- add xinput.d alternatives setup in %%post and %%postun
- provide scim-ja_JP and only uninstall xinput.d-ja_JP alternative if
- no other scim-ja_JP left
+ no scim-ja_JP left
* Fri Jul 29 2005 Jens Petersen <petersen(a)redhat.com> - 0.5.3-1
- update to 0.5.3 release
18 years, 8 months
rpms/scim-tables/FC-4 scim-tables.spec,1.4,1.5
by fedora-extras-commits@redhat.com
Author: ryo
Update of /cvs/extras/rpms/scim-tables/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18191
Modified Files:
scim-tables.spec
Log Message:
some fixes around the update-xinput-scim script
Index: scim-tables.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-tables/FC-4/scim-tables.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scim-tables.spec 31 Jul 2005 01:46:59 -0000 1.4
+++ scim-tables.spec 31 Jul 2005 05:50:42 -0000 1.5
@@ -48,6 +48,7 @@
Summary: SCIM tables for some additional languages
Group: System Environment/Libraries
Requires: scim-tables = %{version}
+Provides: scim-am_ET, scim-ar, scim-vi_VN, scim-ru_RU
%description additional
This package includes table IM data files for additional languages,
@@ -92,6 +93,12 @@
%post ko
%{_libdir}/scim-1.0/update-xinput-scim install ko_KR
+%post additional
+%{_libdir}/scim-1.0/update-xinput-scim install am_ET
+%{_libdir}/scim-1.0/update-xinput-scim install ar
+%{_libdir}/scim-1.0/update-xinput-scim install vi_VN
+%{_libdir}/scim-1.0/update-xinput-scim install ru_RU
+
%postun
/sbin/ldconfig
@@ -106,6 +113,12 @@
%postun ko
%{_libdir}/scim-1.0/update-xinput-scim remove ko_KR
+%postun additional
+%{_libdir}/scim-1.0/update-xinput-scim remove am_ET
+%{_libdir}/scim-1.0/update-xinput-scim remove ar
+%{_libdir}/scim-1.0/update-xinput-scim remove vi_VN
+%{_libdir}/scim-1.0/update-xinput-scim remove ru_RU
+
%files -f %{name}.lang
%defattr(-, root, root, -)
18 years, 8 months
rpms/scim/FC-4 update-xinput-scim,1.2,1.3
by fedora-extras-commits@redhat.com
Author: ryo
Update of /cvs/extras/rpms/scim/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18163
Modified Files:
update-xinput-scim
Log Message:
few more fixes on the script, and add the instruction
Index: update-xinput-scim
===================================================================
RCS file: /cvs/extras/rpms/scim/FC-4/update-xinput-scim,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- update-xinput-scim 31 Jul 2005 04:23:21 -0000 1.2
+++ update-xinput-scim 31 Jul 2005 05:45:36 -0000 1.3
@@ -19,11 +19,30 @@
# FIXME I'm not sure if this is correct
valid_locale_pattern = re.compile("^([a-z][a-z])_[A-Z][A-Z]$")
xinput_locale_pattern = re.compile("^xinput-[a-z][a-z]$|^xinput-[a-z][a-z]_[A-Z][A-Z]$")
+xinput_current_link_pattern = re.compile("link\s+currently\s+points\s+to\s+(%s/\w+)" %xinput_dir)
+xinput_link_pattern = re.compile("(%s/\w+)\s+-\s+priority\s\d+" %xinput_dir)
-script_name = "update-scim-locale"
+script_name = "update-xinput-scim"
+white_space = " "
+usage_message = "Usage: \n\n" + \
+ " %s install LANG [PRIORITY]\n" %script_name + \
+ " %s to install xinput file for LANG with the PRIORITY.\n\n" %white_space + \
+ " %s remove LANG\n" %script_name + \
+ " %s to remove xinput file for LANG\n" %white_space + \
+ " %s only if there is no other IMEngine for LANG in SCIM.\n" %white_space + \
+ " %s This will switch IM from SCIM\n" %white_space + \
+ " %s if there is no more SCIM IMEngine for this LANG.\n\n" %white_space + \
+ " %s list\n" %script_name + \
+ " %s to list LANG which currently uses SCIM.\n\n" %white_space + \
+ " %s dump\n" %script_name + \
+ " %s to dump all locales with xinput entries for SCIM.\n\n" %white_space + \
+ " %s help\n" %script_name + \
+ " %s to show this instruction.\n" %white_space
+read_help_message = "Try \'%s help\' for more information." %script_name
authorization_rejected_message = script_name + ": you must be root to run this script"
-invalid_locale_message = script_name + ": invalid locale"
-too_few_arguments_message = script_name + ": too few arguments"
+invalid_locale_message = script_name + ": invalid locale" + "\n" + read_help_message
+too_few_arguments_message = script_name + ": too few arguments" + "\n" + read_help_message
+too_much_arguments_message = script_name + ": too much arguments" + "\n" + read_help_message
unknown_command_message = script_name + ": unknown command"
# FIXME
@@ -34,6 +53,7 @@
locales = []
+
def check_authorization():
uid = os.getuid()
if uid != 0:
@@ -66,6 +86,30 @@
sys.exit(invalid_locale_returncode)
+def readlink(xinput_locale):
+ current_link = None
+ (fi, fo) = os.popen2("LANG=C;" + alternatives_bin + " --display " + xinput_locale)
+ for line in fo:
+ current_links = xinput_current_link_pattern.findall(line)
+ if len(current_links) > 0:
+ current_link = current_links[0]
+ break
+ fi.close()
+ fo.close()
+ return current_link
+
+
+def dumplinks(xinput_locale):
+ links = []
+ (fi, fo) = os.popen2("LANG=C;" + alternatives_bin + " --display " + xinput_locale)
+ for line in fo:
+ links_in_line = xinput_link_pattern.findall(line)
+ links += links_in_line
+ fi.close()
+ fo.close()
+ return links
+
+
def install(locale, priority):
check_locale(locale)
if priority == -1:
@@ -86,10 +130,7 @@
# there is no more input method for this locale
os.system(alternatives_bin + " --remove " + xinput_locale + " " + xinput_scim)
# check the current input method
- (fi, fo) = os.popen2(readlink_bin + " %s/%s" %(alternatives_dir, xinput_locale))
- current_xinput = fo.readline().strip()
- fi.close()
- fo.close()
+ current_xinput = readlink(xinput_locale)
if current_xinput == xinput_scim:
# change the input method, as scim won't support this locale anymore
os.system(alternatives_bin + " --auto " + xinput_locale)
@@ -102,41 +143,67 @@
if xinput_locale_pattern.match(alternative):
xinput_locales.append(alternative)
for xinput_locale in xinput_locales:
- (fi, fo) = os.popen2(readlink_bin + " %s/%s" %(alternatives_dir, xinput_locale))
- current_xinput = fo.readline().strip()
- fi.close()
- fo.close()
+ current_xinput = readlink(xinput_locale)
if current_xinput == xinput_scim:
locale = xinput_locale[7:]
print(locale)
+def dump():
+ xinput_locales = []
+ alternatives = os.listdir(alternatives_dir)
+ for alternative in alternatives:
+ if xinput_locale_pattern.match(alternative):
+ xinput_locales.append(alternative)
+ for xinput_locale in xinput_locales:
+ links_for_locale = dumplinks(xinput_locale)
+ for link in links_for_locale:
+ if link == xinput_scim:
+ locale = xinput_locale[7:]
+ print(locale)
+
+
# FIXME
def main():
args = sys.argv
if len(args) == 1:
print too_few_arguments_message
sys.exit(too_few_arguments_returncode)
- if args[1] == "install":
+ command = args[1]
+ if command.startswith("--"):
+ command = command[2:]
+ if command == "install":
if len(args) < 3:
print too_few_arguments_message
sys.exit(too_few_arguments_returncode)
locale = args[2]
- if len(args) >= 4:
+ if len(args) == 4:
priority = args[3]
+ elif len(args) > 4:
+ print too_much_arguments_message
+ sys.exit(too_much_arguments_returncode)
else:
priority = -1
install(locale, priority)
- elif args[1] == "remove":
+ elif command == "remove":
if len(args) < 3:
print too_few_arguments_message
sys.exit(too_few_arguments_returncode)
+ elif len(args) > 3:
+ print too_much_arguments_message
+ sys.exit(too_much_arguments_returncode)
locale = args[2]
remove(locale)
- elif args[1] == "list":
+ elif command == "list":
list()
+ elif command == "dump":
+ dump()
+ elif command == "help":
+ print usage_message
+ sys.exit(0)
else:
print unknown_command_message + ": " + args[1]
+ print read_help_message
sys.exit(unknown_command_returncode)
18 years, 8 months