[xkbset] Use a patch to fix Makefile

Till Maas till at fedoraproject.org
Thu Oct 4 11:51:48 UTC 2012


commit fc09ff5a15a169f92dc5b87c17affaf3449ee774
Author: Till Maas <opensource at till.name>
Date:   Thu Oct 4 13:51:37 2012 +0200

    Use a patch to fix Makefile
    
    - Do not remove buildroot in %install
    - Add .desktop file

 .gitignore               |    1 +
 sources                  |    1 +
 xkbset-0.5-install.patch |   16 +++++++++++
 xkbset.desktop           |    6 ++++
 xkbset.spec              |   65 ++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 89 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..74ae2e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/xkbset-0.5.tar.gz
diff --git a/sources b/sources
index e69de29..a474445 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+282c416a76a237fa84a7b513c9d7b2cf  xkbset-0.5.tar.gz
diff --git a/xkbset-0.5-install.patch b/xkbset-0.5-install.patch
new file mode 100644
index 0000000..10c0f64
--- /dev/null
+++ b/xkbset-0.5-install.patch
@@ -0,0 +1,16 @@
+diff -up xkbset-0.5/Makefile.install xkbset-0.5/Makefile
+--- xkbset-0.5/Makefile.install	2012-10-03 09:30:23.322309774 +0200
++++ xkbset-0.5/Makefile	2012-10-03 09:32:40.491731457 +0200
+@@ -50,9 +50,11 @@ INSTALL_SCRIPT=	${INSTALL}
+ INSTALL_PROGRAM=${INSTALL} -s
+ 
+ install: all
++	${INSTALL} -d ${INSTALL_BIN}
++	${INSTALL} -d ${INSTALL_MAN1}
+ 	${INSTALL_PROGRAM} xkbset ${INSTALL_BIN}
+ 	${INSTALL_SCRIPT} xkbset-gui ${INSTALL_BIN}
+-	${INSTALL_DATA} xkbset.1 ${INSTALL_MAN1}
++	${INSTALL_DATA} -m 644 xkbset.1 ${INSTALL_MAN1}
+ 
+ clean:
+ 	rm -f *.o getargs.c print.c usage.c *.core xkbset config_usage xkbset.1
diff --git a/xkbset.desktop b/xkbset.desktop
new file mode 100644
index 0000000..528d311
--- /dev/null
+++ b/xkbset.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Name=xkbset
+Comment=Configure XKB extensions like AccessX
+Exec=xkbset-gui
+Categories=Settings;DesktopSettings;HardwareSettings;
diff --git a/xkbset.spec b/xkbset.spec
new file mode 100644
index 0000000..5c0a5b1
--- /dev/null
+++ b/xkbset.spec
@@ -0,0 +1,65 @@
+Name:           xkbset
+Version:        0.5
+Release:        2%{?dist}
+Summary:        Tool to configure XKB extensions
+
+License:        BSD
+URL:            http://www.math.missouri.edu/~stephen/software/#xkbset
+Source0:        http://www.math.missouri.edu/~stephen/software/xkbset/xkbset-%{version}.tar.gz
+# 2012-10-03: Sent upstream via e-mail
+Source3:        xkbset.desktop
+# 2012-10-03: Sent upstream via e-mail
+Patch0:         xkbset-0.5-install.patch
+
+# for /usr/include/X11/Xlib.h
+BuildRequires:  libX11-devel
+BuildRequires: desktop-file-utils
+
+
+%description
+xkbset is a program rather like xset in that it allows you to set various
+features of the X window interface.  It allows one to configure most of the
+options connected with the XKB extensions.  They are described in Section 10 of
+XKBlib.ps.
+
+This includes customizing the following:
+  MouseKeys:  using the numeric pad keys to move the mouse;
+  StickyKeys: where modifiers like control and shift will lock until the
+              next key press (good for one finger typing);
+  SlowKeys:   The keys will not work unless they are pressed for a certain
+              amount of time;
+  BounceKeys: If a key is pressed more than once rapidly, only one key
+              press will be registered.
+
+%prep
+%setup -q
+%patch0 -p1 -b .install
+
+
+%build
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+
+
+%install
+%make_install X11PREFIX=%{_prefix} INSTALL_PROGRAM=install INSTALL_MAN1=$RPM_BUILD_ROOT/%{_mandir}/man1
+desktop-file-install                                    \
+--dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
+%{SOURCE3}
+
+
+%files
+%doc COPYRIGHT README TODO VERSIONS
+%{_bindir}/xkbset
+%{_bindir}/xkbset-gui
+%{_mandir}/man1/xkbset.1*
+%{_datadir}/applications/xkbset.desktop
+
+
+%changelog
+* Wed Oct 03 2012 Till Maas <opensource at till.name> - 0.5-2
+- Use a patch to fix Makefile
+- Do not remove buildroot in %%install
+- Add .desktop file
+
+* Tue Oct 02 2012 Till Maas <opensource at till.name> - 0.5-1
+- Initial version for Fedora


More information about the scm-commits mailing list