rpms/synergy/F-8 synergy-1.3.1-X11-DPMS.patch, NONE, 1.1 synergy-1.3.1-X11-selection.patch, NONE, 1.1 synergy-1.3.1-warnings.patch, NONE, 1.1 synergyc.1, NONE, 1.1 synergys.1, NONE, 1.1 synergy.spec, 1.20, 1.21 synergy-1.2.2-werror.patch, 1.1, NONE
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Mon Jun 2 19:42:28 UTC 2008
Author: jwrdegoede
Update of /cvs/extras/rpms/synergy/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28963
Modified Files:
synergy.spec
Added Files:
synergy-1.3.1-X11-DPMS.patch synergy-1.3.1-X11-selection.patch
synergy-1.3.1-warnings.patch synergyc.1 synergys.1
Removed Files:
synergy-1.2.2-werror.patch
Log Message:
* Mon Jun 2 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.1-9
- Drop no longer needed patch0, stop regenerating autoxxx files
- Apply the following bug fixes from upstream's bug tracker:
-off by one bugfix to X11 selection (fixes copy and paste by selection)
-call DPMSOn() when entering screen to make sure powersaving mode is canceled
on X11 client systems when the fake mouse / keyb become active
- Add manpages (courtesy of Debian)
synergy-1.3.1-X11-DPMS.patch:
--- NEW FILE synergy-1.3.1-X11-DPMS.patch ---
diff -up synergy-1.3.1/lib/platform/CXWindowsScreen.cpp.dpms synergy-1.3.1/lib/platform/CXWindowsScreen.cpp
--- synergy-1.3.1/lib/platform/CXWindowsScreen.cpp.dpms 2008-06-02 19:32:47.000000000 +0200
+++ synergy-1.3.1/lib/platform/CXWindowsScreen.cpp 2008-06-02 19:39:32.000000000 +0200
@@ -36,6 +36,9 @@
# define XK_MISCELLANY
# define XK_XKB_KEYS
# include <X11/keysymdef.h>
+ extern "C" {
+# include <X11/extensions/dpms.h>
+ }
# if HAVE_X11_EXTENSIONS_XTEST_H
# include <X11/extensions/XTest.h>
# else
@@ -230,6 +233,19 @@ CXWindowsScreen::enter()
XSetInputFocus(m_display, m_lastFocus, m_lastFocusRevert, CurrentTime);
}
+ // Force the DPMS to turn screen back on since we don't
+ // actually cause physical hardware input to trigger it
+ int dummy;
+ CARD16 powerlevel;
+ BOOL enabled;
+ if (DPMSQueryExtension(m_display, &dummy, &dummy) &&
+ DPMSCapable(m_display) &&
+ DPMSInfo(m_display, &powerlevel, &enabled))
+ {
+ if (enabled && powerlevel != DPMSModeOn)
+ DPMSForceLevel(m_display, DPMSModeOn);
+ }
+
// unmap the hider/grab window. this also ungrabs the mouse and
// keyboard if they're grabbed.
XUnmapWindow(m_display, m_window);
synergy-1.3.1-X11-selection.patch:
--- NEW FILE synergy-1.3.1-X11-selection.patch ---
--- synergy-1.3.1/lib/platform/CXWindowsClipboard.cpp~ 2008-06-02 16:43:10.000000000 +0200
+++ synergy-1.3.1/lib/platform/CXWindowsClipboard.cpp 2008-06-02 16:43:10.000000000 +0200
@@ -1193,7 +1193,7 @@ CXWindowsClipboard::wasOwnedAtTime(::Tim
// compare time to range
Time duration = lost - m_timeOwned;
Time when = time - m_timeOwned;
- return (/*when >= 0 &&*/ when < duration);
+ return (/*when >= 0 &&*/ when <= duration);
}
Atom
synergy-1.3.1-warnings.patch:
--- NEW FILE synergy-1.3.1-warnings.patch ---
diff -up synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp~ synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp
--- synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp~ 2008-06-02 20:22:31.000000000 +0200
+++ synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp 2008-06-02 20:22:31.000000000 +0200
@@ -38,6 +38,8 @@ CArchDaemonUnix::~CArchDaemonUnix()
int
CArchDaemonUnix::daemonize(const char* name, DaemonFunc func)
{
+ int dummy;
+
// fork so shell thinks we're done and so we're not a process
// group leader
switch (fork()) {
@@ -58,7 +60,7 @@ CArchDaemonUnix::daemonize(const char* n
setsid();
// chdir to root so we don't keep mounted filesystems points busy
- chdir("/");
+ dummy = chdir("/");
// mask off permissions for any but owner
umask(077);
@@ -72,7 +74,7 @@ CArchDaemonUnix::daemonize(const char* n
// of standard I/O safely goes in the bit bucket.
open("/dev/null", O_RDONLY);
open("/dev/null", O_RDWR);
- dup(1);
+ dummy = dup(1);
// invoke function
return func(1, &name);
diff -up synergy-1.3.1/lib/arch/CArchNetworkBSD.cpp~ synergy-1.3.1/lib/arch/CArchNetworkBSD.cpp
--- synergy-1.3.1/lib/arch/CArchNetworkBSD.cpp~ 2008-06-02 20:25:02.000000000 +0200
+++ synergy-1.3.1/lib/arch/CArchNetworkBSD.cpp 2008-06-02 20:27:12.000000000 +0200
@@ -314,8 +314,10 @@ CArchNetworkBSD::pollSocket(CPollEntry p
if (n > 0 && unblockPipe != NULL && (pfd[num].revents & POLLIN) != 0) {
// the unblock event was signalled. flush the pipe.
char dummy[100];
+ int ignore;
+
do {
- read(unblockPipe[0], dummy, sizeof(dummy));
+ ignore = read(unblockPipe[0], dummy, sizeof(dummy));
} while (errno != EAGAIN);
// don't count this unblock pipe in return value
@@ -487,7 +489,9 @@ CArchNetworkBSD::unblockPollSocket(CArch
const int* unblockPipe = getUnblockPipeForThread(thread);
if (unblockPipe != NULL) {
char dummy = 0;
- write(unblockPipe[1], &dummy, 1);
+ int ignore;
+
+ ignore = write(unblockPipe[1], &dummy, 1);
}
}
--- NEW FILE synergyc.1 ---
.\" This manpage has been automatically generated by docbook2man
.\" from a DocBook document. This tool can be found at:
.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng <steve at ggi-project.org>.
.TH "SYNERGYC" "1" "02 June 2008" "" ""
.SH NAME
synergyc \- synergy client
.SH SYNOPSIS
\fBsynergyc\fR [ \fB-d \fIlevel\fB\fR | \fB--debug \fIlevel\fB\fR ] [ \fB--display \fIdisplay\fB\fR ] [ \fB--daemon\fR | \fB{ --no-daemon | -f }\fR ] [ \fB-n \fIname\fB\fR | \fB--name \fIname\fB\fR ] [ \fB--restart\fR | \fB{ --no-restart | -1 }\fR ] \fB\fIaddress\fB\fR
\fBsynergyc\fR \fB { --help | -h }\fR
\fBsynergyc\fR \fB --version\fR
.SH "DESCRIPTION"
.PP
Starts the \fBsynergyc\fR
mouse/keyboard sharing client.
.PP
This manual page was written for the Debian distribution
because the original program does not have a manual page.
See the documentation in \fI/usr/share/doc/synergy/doc/index.html\fR
for most up-to-date information.
.SH "OPTIONS"
.TP
\fB-d \fIlevel\fB --debug \fIlevel\fB \fR
use debugging level \fIlevel\fR\&.
Debug levels are from highest to lowest: FATAL,
ERROR, WARNING, NOTE, INFO, DEBUG, DEBUG1, and DEBUG2.
Only messages at or above the given level are logged.
Messages are logged to a terminal window when running in
the foreground, and to syslog when running as a daemon.
.TP
\fB--display \fIdisplay\fB \fR
connect to the X server at \fIdisplay\fR
.TP
\fB--daemon \fR
run the client as a daemon.
.TP
\fB-f --no-daemon \fR
run in client the foreground.
.TP
\fB-n \fIscreen-name\fB --name \fIscreen-name\fB \fR
use \fIscreen-name\fR instead of
the hostname.
This option lets the client use a name other than its
hostname for its screen. This name is used when checking
the configuration.
.TP
\fB--restart \fR
restart the client automatically if it fails.
.TP
\fB-1 --no-restart \fR
do not try to restart the client if it fails for some
reason.
.TP
\fB-h --help \fR
display help and exit.
.TP
\fB--version \fR
display version information and exit.
.TP
\fB\fIaddress\fB \fR
address of server.
\fIaddress\fR has one of the
following forms:
.RS
.TP 0.2i
\(bu
\fIhostname\fR
.TP 0.2i
\(bu
\fIhostname\fR:\fIport\fR
.RE
\fIhostname\fR is a hostname or
address of a network interface on the server
system. \fIport\fR is a port number
from 1 to 65535. \fIport\fR defaults
to 24800.
.SH "RUNNING THE CLIENT"
.PP
Run the client on all computers that aren't the server using
the following command line:
\fBsynergyc \fR \fB-f\fR \fB\fIserver-hostname\fB\fR
Replace \fIserver-hostname\fR with the
hostname or address of the server system. The `-f' option causes
synergy to run in the foreground. This option is recommended until
you've verified that the configuration works.
If you didn't include the system's
hostname in the configuration file (either as a screen name or
an alias) then you'll have to add `--name
\fIscreen-name\fR\&' to the command line,
where \fIscreen-name\fR is a name in the
configuration file.
.PP
The client should quickly report `connected to server'. If it
does not but doesn't print an error and exit immediately then
it's trying to connect to the server but cannot. It will time
out in 30 seconds and exit (use ctrl+c to exit earlier). You
should check that the server is running and is reachable over
the network and try again.
.PP
If the client fails and exits it should print an error describing
the problem. Here are typical problems and possible solutions:
.TP 0.2i
\(bu
failed to open screen:
check permission to open the X display
check that the DISPLAY environment variable is set
.TP 0.2i
\(bu
already connected:
check that the synergy client isn't already running
.TP 0.2i
\(bu
refused client:
add client to the server's configuration file
.TP 0.2i
\(bu
connection failed:
check \fIserver-hostname\fR
the server cannot open the desired port, stop the
program using that port (24800) and restart the
server
.PP
Once all the clients are running, try moving the mouse to each
screen. Be sure to check all the configured links.
.SH "STARTING AUTOMATICALLY"
.PP
Synergy requires an X server. That means a server must be
running and synergy must be authorized to connect to that server.
I recommend to start the synergy client from a start script
of your desktop environment or window manager. The commands
should look something like this:
\fBpkill synergyc\fR
\fBsynergyc\fR [ \fB\fIoptions\fB\fR ] \fB\fIserver-hostname\fB\fR
.PP
If you are using GNOME, you can add the synergy client to the
list of the non-session-managed startup programs. For doing this,
start the control center, choose `Session Properties & Startup'
and then `Startup Programs'. Add a new entry with `\fB/usr/bin/synergyc
\fIserver-hostname\fB\fR\&' as the startup command.
.PP
\fIoptions\fR must not include `-f' or `--no-daemon'.
It's important to make sure no old copies of synergy are running so they
can't interfere with the new one.
.SH "SEE ALSO"
.PP
synergys(1)
.SH "AUTHOR"
.PP
This manual page was written by Daniel Lutz <danlutz at debian.org> for
the Debian system. Edited by Titus Barik <barik at ieee.org>\&.
--- NEW FILE synergys.1 ---
.\" This manpage has been automatically generated by docbook2man
.\" from a DocBook document. This tool can be found at:
.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng <steve at ggi-project.org>.
.TH "SYNERGYS" "1" "02 June 2008" "" ""
.SH NAME
synergys \- synergy server
.SH SYNOPSIS
\fBsynergys\fR [ \fB-a \fIaddress\fB\fR | \fB--address \fIaddress\fB\fR ] [ \fB-c \fIpathname\fB\fR | \fB--config \fIpathname\fB\fR ] [ \fB-d \fIlevel\fB\fR | \fB--debug \fIlevel\fB\fR ] [ \fB--display \fIdisplay\fB\fR ] [ \fB--daemon\fR | \fB{ --no-daemon | -f }\fR ] [ \fB-n \fIscreen-name\fB\fR | \fB--name \fIscreen-name\fB\fR ] [ \fB--restart\fR | \fB{ --no-restart | -1 }\fR ] \fB\fIaddress\fB\fR
\fBsynergys\fR \fB { -h | --help }\fR
\fBsynergys\fR \fB --version\fR
.SH "DESCRIPTION"
.PP
Starts the \fBsynergys\fR mouse/keyboard
sharing server.
.PP
\fBSynergy\fR lets you use one keyboard and
mouse across multiple computers. To do so it requires that all
the computers are connected to each other via TCP/IP
networking. Most systems come with this installed.
.PP
This manual page was written for the Debian distribution
because the original program does not have a manual page.
See the documentation in \fI/usr/share/doc/synergy/doc/index.html\fR
for most up-to-date information.
.SH "OPTIONS"
.TP
\fB -a \fIaddress\fB --address \fIaddress\fB \fR
listen for clients on the given address.
The argument for --address is of the form:
[\fIhostname\fR][:\fIport\fR].
The hostname must be the address or hostname of an
interface on the system. The default is to listen on all
interfaces. The port overrides the default port, 24800.
.TP
\fB-c \fIpathname\fB --config \fIpathname\fB \fR
use the named configuration file instead.
If no configuration file pathname is provided then the first of the
following to load sets the configuration:
.RS
.TP 0.2i
\(bu
\fI~/.synergy.conf\fR
.TP 0.2i
\(bu
\fI/etc/synergy.conf\fR
.RE
If no configuration file can be loaded then the
configuration uses its defaults with just the server
screen.
.TP
\fB -d \fIlevel\fB --debug \fIlevel\fB \fR
filter out log messages with priority below
\fIlevel\fR\&.
Debug levels are from highest to lowest: FATAL, ERROR,
WARNING, NOTE, INFO, DEBUG, DEBUG1, and DEBUG2. Only
messages at or above the given level are logged. Messages
are logged to a terminal window when running in the
foreground, and to syslog when running as a daemon.
.TP
\fB--display \fIdisplay\fB \fR
connect to the X server at \fIdisplay\fR
.TP
\fB--daemon \fR
run the server as a daemon.
.TP
\fB-f --no-daemon \fR
run the server in the foreground.
.TP
\fB-n \fIscreen-name\fB --name \fIscreen-name\fB \fR
use \fIscreen-name\fR instead of
the hostname to identify this screen in the
configuration.
This option lets the client use
a name other than its hostname for its screen.
.TP
\fB--restart \fR
restart the server automatically if it fails.
.TP
\fB-1 --no-restart \fR
do not try to restart the server if it fails for some
reason.
.TP
\fB-h --help \fR
display help and exit.
.TP
\fB--version \fR
display version information and exit.
.SH "CONFIGURING THE SERVER"
.PP
The synergy server requires configuration. The configuration
file is a plain text file broken into sections. Each section
has the form:
.nf
section: <name>
\~\~<args>
end
.fi
.PP
Comments are introduced by `#' and continue to the end of the
line. The file can have the following sections. The `screens'
section must appear before the `links' and `aliases' sections.
.SS "SCREENS"
.PP
<args> is a list of screen names, one name per line,
each followed by a colon. Names are arbitrary strings but
they must be unique. The hostname of each computer is
recommended. There must be a screen name for the server and
each client. Each screen can specify a number of options.
Options have the form `name = value' and a listed one per line
after the screen name.
.PP
Example:
.nf
section: screens
\~\~moe:
\~\~larry:
\~\~\~\~halfDuplexCapsLock = true
\~\~\~\~halfDuplexNumLock = true
\~\~curly:
\~\~\~\~meta = alt
end
.fi
.PP
This declares three screens named: moe, larry, and curly.
Screen `larry' has half-duplex caps lock and num lock keys
(see below) and screen `curly' converts the meta modifier key
to the alt key.
.PP
Screen can have the following options:
.TP 0.2i
\(bu
halfDuplexCapsLock = {true|false}
This computer has a caps lock key that doesn't report a
press and a release event when the user presses it but
instead reports a press event when it's turned on and a
release event when it's turned off. If caps lock acts
strangely on all screens then you may need this option on
the server screen. If it acts strangely on one screen
then that screen may need the option.
.TP 0.2i
\(bu
halfDuplexNumLock = {true|false}
This is identical to halfDuplexCapsLock except it applies
to the num lock key.
.TP 0.2i
\(bu
xtestIsXineramaUnaware = {true|false}
This option works around a bug in the XTest extension when
used in combination with Xinerama. It affects X11 clients
only. Not all versions of the XTest extension are aware
of the Xinerama extension. As a result, they do not move
the mouse correctly when using multiple Xinerama screens.
This option is currently true by default. If you know
your XTest extension is Xinerama aware then set this
option to false.
.TP 0.2i
\(bu
Modifier keys:
shift = {shift|ctrl|alt|meta|super|none}
ctrl = {shift|ctrl|alt|meta|super|none}
alt = {shift|ctrl|alt|meta|super|none}
meta = {shift|ctrl|alt|meta|super|none}
super = {shift|ctrl|alt|meta|super|none}
Map a modifier key pressed on the server's keyboard to a
different modifier on this client. This option only has
an effect on a client screen; it's accepted and ignored on
the server screen.
You can map, say, the shift key to shift (the default),
ctrl, alt, meta, super or nothing. Normally, you wouldn't
remap shift or ctrl. You might, however, have an X11
server with meta bound to the Alt keys. To use this
server effectively with a windows client, which doesn't
use meta but uses alt extensively, you'll want the windows
client to map meta to alt (using `meta = alt').
.SS "LINKS"
.PP
<args> is a list of screen names just like in the
`screens' section except each screen is followed by a list
of links, one per line. Each link has the form
`<left|right|up|down> = <name>\&'. A link
indicates which screen is adjacent in the given direction.
.PP
Example:
.nf
section: links
moe:
\~\~right = larry
\~\~up\~\~\~\~= curly
larry:
\~\~left = moe
\~\~up\~\~\~\~= curly
curly:
\~\~down\~\~= larry
end
.fi
.PP
This indicates that screen `larry' is to the right of screen
`moe' (so moving the cursor off the right edge of moe would
make it appear at the left edge of larry), `curly' is above
'moe', `moe' is to the left of `larry', `curly' is above
`larry', and `larry' is below `curly'. Note that links do not
have to be symmetrical; moving up from moe then down from
curly lands the cursor on larry.
.SS "ALIASES"
.PP
<args> is a list of screen names just like in the
`screens' section except each screen is followed by a list of
aliases, one per line *not* followed by a colon. An alias is
a screen name and must be unique. During screen name lookup
each alias is equivalent to the screen name it aliases. So a
client can connect using its canonical screen name or any of
its aliases.
.PP
Example:
.nf
section: aliases
larry:
\~\~larry.stooges.com
curly:
\~\~shemp
end
.fi
.PP
Screen `larry' is also known as `larry.stooges.com' and can
connect as either name. Screen `curly' is also known as
`shemp'. (Hey, it's just an example.)
.SS "OPTIONS"
.PP
<args> is a list of lines of the form `name =
value'. These set the global options.
.PP
Example:
.nf
section: options
\~heartbeat = 5000
\~switchDelay = 500
end
.fi
.PP
You can use the following options:
.TP 0.2i
\(bu
heartbeat = N
The server will expect each client to send a message no
less than every N milliseconds. If no message arrives
from a client within 3N seconds the server forces that
client to disconnect.
If synergy fails to detect clients disconnecting while the
server is sleeping or vice versa, try using this option.
.TP 0.2i
\(bu
switchDelay = N
Synergy won't switch screens when the mouse reaches the
edge of a screen unless it stays on the edge for N
milliseconds. This helps prevent unintentional switching
when working near the edge of a screen.
.TP 0.2i
\(bu
switchDoubleTap = N
Synergy won't switch screens when the mouse reaches the
edge of a screen unless it's moved away from the edge and
then back to the edge within N milliseconds. With the
option you have to quickly tap the edge twice to switch.
This helps prevent unintentional switching when working
near the edge of a screen.
.TP 0.2i
\(bu
screenSaverSync = {true|false}
If set to false then synergy won't synchronize screen
savers. Client screen savers will start according to
their individual configurations. The server screen saver
won't start if there is input, even if that input is
directed toward a client screen.
.PP
The synergy server will try certain pathnames to load the
configuration file if the user doesn't specify a path using
the `--config' command line option. `synergys --help' reports
those pathnames.
.SH "RUNNING THE SERVER"
.PP
Run the server on the computer that has the keyboard and mouse
to be shared. You must have prepared a configuration file
before starting the server. The server should be started before
the clients but that's not required.
.PP
Run the synergy server on the server system using the following
command line:
\fBsynergys\fR \fB -f\fR [ \fB--config \fIconfig-pathname\fB\fR ]
.PP
Replace \fIconfig-pathname\fR with the path
to the configuration file. See OPTIONS for the default locations
of the configuration file. The `-f' option causes synergys to
run in the foreground. This is recommended until you've
verified that the configuration works. If you didn't include
the system's hostname in the configuration file (either as a
screen name or an alias) then you'll have to add `--name
\fIscreen-name\fR\&' to the command line,
where \fIscreen-name\fR is a name in the
configuration file. You can use `synergys --help' for a list of
command line options.
.PP
See `Starting Automatically on Unix' below for running synergy
automatically when the X server starts.
.SH "CONFIGURE SYNERGY TO START AUTOMATICALLY"
.PP
Synergy requires an X server. That means a server must be
running and synergy must be authorized to connect to that
server. It's best to have the display manager start
synergy. You'll need the necessary (probably root) permission to
modify the display manager configuration files. If you don't
have that permission you can start synergy after logging in via
the .xsession file.
.PP
To start the server use something like:
\fBkillall \fR \fBsynergys\fR
\fBsynergys\fR [ \fB<options>\fR ] \fB --config <config-pathname>\fR
.PP
<options> must not include `-f' or `--no-daemon'. If the
configuration pathname is one of the default locations then you
don't need the `--config' option.
.PP
Note that some display managers (xdm and kdm, but not gdm) grab
the keyboard and do not release it until the user logs in, for
security reasons. This prevents a synergy server from sharing
the mouse and keyboard until the user logs in.
.SH "NETWORK SECURITY"
.PP
Synergy has no built-in support for encryption or
authentication. The server accepts connections from any
computer. The server and clients send all data unencrypted
which means the clipboard and mouse and keyboard events
(e.g. typed passwords) are easily examined by anyone listening
on the network. Therefore, do not run synergy on untrusted
networks except as follows.
.PP
You can use SSH (secure shell) to provide strong authentication
and encryption to synergy without modifying either SSH or synergy.
On Linux and Unix a free implementation of SSH called OpenSSH is
available at http://www.openssh.com/. On Windows you can use the
Cygwin version of OpenSSH.
\fBssh \fR \fB-f\fR \fB-N\fR \fB-L
24800:\fIserver-hostname\fB:24800
\fR \fB\fIserver-hostname\fB\fR
.PP
where \fIserver-hostname\fR is the name or
address of the SSH and synergy server host. 24800 is the default
synergy port; replace it with whichever port you use if you don't use
the default. Once ssh authenticates with the server, start the
synergy client as usual except use `localhost' or `127.0.0.1' for the
server address. Synergy will then pass all communication through SSH
which encrypts it, passes it over the network, decrypts it, and hands
it back to synergy. Authentication is provided by SSH's
authentication.
.SH "FILES"
.PP
~/.synergy.conf, /etc/synergy.conf
.SH "SEE ALSO"
.PP
synergyc(1), ssh(1)
.SH "AUTHOR"
.PP
This manual page was written by Daniel Lutz <danlutz at debian.org> for
the Debian system. Edited by Titus Barik <barik at ieee.org>\&.
Index: synergy.spec
===================================================================
RCS file: /cvs/extras/rpms/synergy/F-8/synergy.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- synergy.spec 2 Jun 2008 10:01:16 -0000 1.20
+++ synergy.spec 2 Jun 2008 19:41:35 -0000 1.21
@@ -1,19 +1,21 @@
Summary: Mouse and keyboard sharing utility
Name: synergy
Version: 1.3.1
-Release: 8%{?dist}
+Release: 9%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL: http://synergy2.sourceforge.net/
Source: http://downloads.sf.net/synergy2/synergy-%{version}.tar.gz
-Patch0: synergy-1.2.2-werror.patch
+Source1: synergyc.1
+Source2: synergys.1
Patch1: synergy-1.3.1-gcc43.patch
Patch2: synergy-1.3.1-copynpaste-crash.patch
+Patch3: synergy-1.3.1-X11-selection.patch
+Patch4: synergy-1.3.1-X11-DPMS.patch
+Patch5: synergy-1.3.1-warnings.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: libX11-devel, libXext-devel, libXtst-devel, libXt-devel
BuildRequires: libXinerama-devel
-# Required by autoreconf
-BuildRequires: autoconf, automake
%description
Synergy lets you easily share a single mouse and keyboard between
@@ -25,10 +27,11 @@
%prep
%setup -q
-%patch0 -p1 -b .werror
%patch1 -p1 -b .gcc43
%patch2 -p1 -b .copynpaste
-autoreconf
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%build
@@ -39,6 +42,9 @@
%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}
+mkdir -p %{buildroot}%{_mandir}/man1
+install -p -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1
+install -p -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1
%clean
@@ -52,9 +58,18 @@
%doc examples/synergy.conf
%{_bindir}/synergyc
%{_bindir}/synergys
+%{_mandir}/man1/synergy*.1.gz
%changelog
+* Mon Jun 2 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.1-9
+- Drop no longer needed patch0, stop regenerating autoxxx files
+- Apply the following bug fixes from upstream's bug tracker:
+ -off by one bugfix to X11 selection (fixes copy and paste by selection)
+ -call DPMSOn() when entering screen to make sure powersaving mode is canceled
+ on X11 client systems when the fake mouse / keyb become active
+- Add manpages (courtesy of Debian)
+
* Mon Jun 2 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.1-8
- Fix synergy crashing on copy and paste (bz 434539)
--- synergy-1.2.2-werror.patch DELETED ---
More information about the fedora-extras-commits
mailing list