rpms/gdm/devel gdmthemetester.in,NONE,1.1 gdm.spec,1.144,1.145
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Apr 11 20:47:23 UTC 2006
Author: rstrode
Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4569
Modified Files:
gdm.spec
Added Files:
gdmthemetester.in
Log Message:
- Add gdmthemetester.in to the mix (upstream bug 338079)
--- NEW FILE gdmthemetester.in ---
#!/bin/sh
gdmwhich () {
COMMAND="$1"
OUTPUT=
IFS=:
for dir in $PATH
do
if test -x "$dir/$COMMAND" ; then
if test "x$OUTPUT" = "x" ; then
OUTPUT="$dir/$COMMAND"
fi
fi
done
IFS=$OLD_IFS
echo "$OUTPUT"
}
echo
echo "GDM Theme Tester"
echo
echo "Be sure to test all the environments:"
echo " console, console-timed, flexi, remote-flexi, xdmcp"
echo "Also be sure to test using caps lock"
echo
XNEST=`gdmwhich Xnest`
GDMXNEST=`gdmwhich gdmXnest`
GDMGREETER="@libexecdir@/gdmgreeter"
if [ x$XNEST = x ]; then
echo "ERROR: Xnest not found"
echo ""
exit 1
fi
if [ x$GDMXNEST = x ]; then
echo "ERROR: gdmXnest not found"
echo ""
exit 1
fi
if [ x$GDMGREETER = x ]; then
echo "ERROR: gdmgreeter not found"
echo ""
exit 1
fi
USAGE="
Usage: $0 <environment> <theme>
<environment> is one of: console, console-timed, flexi, remote-flexi, xdmcp
<theme> is either the path of the theme or the name of an installed theme
If you set the environment variable XNESTSIZE to <width>x<height> (e.g. 800x600)
you can test the greeter at that resolution
"
if [ "$#" != 2 ]; then
echo "$USAGE"
exit 1
fi
GDM_THEME="$2"
DOING_GDM_DEVELOPMENT=yes
GDM_PARENT_DISPLAY="$DISPLAY"
export GDM_THEME DOING_GDM_DEVELOPMENT GDM_PARENT_DISPLAY
case $1 in
console)
GDM_IS_LOCAL=yes
export GDM_IS_LOCAL
;;
console-timed)
GDM_IS_LOCAL=yes
GDM_FAKE_TIMED=yes
export GDM_IS_LOCAL GDM_FAKE_TIMED
;;
flexi)
GDM_IS_LOCAL=yes
GDM_FLEXI_SERVER=yes
export GDM_IS_LOCAL GDM_FLEXI_SERVER
;;
remote-flexi)
GDM_FLEXI_SERVER=yes
export GDM_FLEXI_SERVER
;;
xdmcp)
;;
*)
echo "$USAGE"
exit 1
;;
esac
if [ "x$XNESTSIZE" = x ] ; then
eval `gdmXnest -b`
else
eval `gdmXnest -b -o "-geometry $XNESTSIZE"`
fi
export DISPLAY
if [ "x$GDM_PARENT_DISPLAY" = "x$DISPLAY" ]; then
echo "ERROR: Can't start the Xnest server"
exit 1
fi
# This may not be necessary
sleep 1
@libexecdir@/gdmgreeter
Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- gdm.spec 11 Apr 2006 13:28:05 -0000 1.144
+++ gdm.spec 11 Apr 2006 20:47:21 -0000 1.145
@@ -15,7 +15,7 @@
Summary: The GNOME Display Manager.
Name: gdm
Version: 2.14.1
-Release: 2
+Release: 3
Epoch: 1
License: LGPL/GPL
Group: User Interface/X
@@ -24,6 +24,7 @@
Source1: gdm-allow-login.init
Source2: gdm-early-login.init
Source3: zzz-bootup-complete.init
+Source4: gdmthemetester.in
Patch1: gdm-2.14.1-change-defaults.patch
Patch2: gdm-2.8.0.2-add-pam-timestamp-module.patch
@@ -115,6 +116,15 @@
%patch19 -p1 -b .add-gnome-cflags
%patch22 -p1 -b .pam_stack
+# http://bugzilla.gnome.org/show_bug.cgi?id=338079
+if [ -f gui/greeter/gdmthemetester.in ]
+then
+ echo "gdmthemetester.in is back. Get rid of Source4" 1>&2
+ exit
+fi
+
+cp -f %{SOURCE4} gui/greeter
+
# fix the time format for ja
perl -pi -e "s|^msgstr \"%a %b %d, %H:%M\"|msgstr \"%m/%d \(%a\) %H:%M\"|; s|^msgstr \"%a %b %d, %I:%M %p\"|msgstr \"%m/%d \(%a\) %p %I:%M\"|" po/ja.po
@@ -308,6 +318,9 @@
%attr(1770, root, gdm) %dir %{_localstatedir}/gdm
%changelog
+* Tue Apr 11 2006 Ray Strode <rstrode at redhat.com> - 1:2.14.1-3
+- Add gdmthemetester.in to the mix (upstream bug 338079)
+
* Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.14.1-2
- Update to 2.14.1
More information about the fedora-cvs-commits
mailing list