Mailinglist Archive: opensuse-commit (1318 mails)
| < Previous | Next > |
commit xkeyboard-config
- From: root@xxxxxxx (h_root)
- Date: Wed, 2 Aug 2006 12:53:22 +0200 (CEST)
- Message-id: <20060802105322.A100494E98@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package xkeyboard-config
checked in at Wed Aug 2 12:53:22 CEST 2006.
--------
--- xkeyboard-config/xkeyboard-config.changes 2006-07-28 14:43:41.000000000 +0200
+++ xkeyboard-config/xkeyboard-config.changes 2006-08-01 20:55:29.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Aug 1 20:55:23 CEST 2006 - sndirsch@xxxxxxx
+
+- added xorg-x11 to Requires/BuildRequires to fix build
+- cleanup
+
+-------------------------------------------------------------------
Old:
----
README.SuSE
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xkeyboard-config.spec ++++++
--- /var/tmp/diff_new_pack.rYSWqf/_old 2006-08-02 12:53:15.000000000 +0200
+++ /var/tmp/diff_new_pack.rYSWqf/_new 2006-08-02 12:53:15.000000000 +0200
@@ -11,22 +11,18 @@
# norootforbuild
Name: xkeyboard-config
-#!BuildIgnore: xorg-modular
BuildRequires: intltool perl-XML-Parser xorg-x11 xorg-x11-devel
URL: http://www.freedesktop.org/Software/XKeyboardConfig
-%define REPLACE_XORG_XKB_FILES 1
License: GPL, LGPL
Group: System/X11/Utilities
-%if REPLACE_XORG_XKB_FILES
+Requires: xorg-x11
Provides: xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us
-%endif
PreReq: /bin/ln /bin/rm
Autoreqprov: on
Version: 0.8
-Release: 9
+Release: 10
Summary: The X Keyboard Extension
Source: %name-%version.tar.bz2
-Source1: README.SuSE
Patch: p_suse.diff
Patch1: ibm_space_saver.diff
Patch4: p_macintosh-kb.diff
@@ -63,20 +59,13 @@
%patch7
%patch8
%patch9
-%if !%{REPLACE_XORG_XKB_FILES}
-cp $RPM_SOURCE_DIR/README.SuSE .
-%endif
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
intltoolize --force
autoreconf -fi
./configure --with-xkb-rules-symlink=xfree86,xorg \
-%if %REPLACE_XORG_XKB_FILES
--with-xkb-base=/usr/share/X11/xkb \
-%else
- --with-xkb-base=/usr/share/X11/xkeyboard-config \
-%endif
--enable-compat_rules \
--disable-xkbcomp-symlink
make
@@ -84,30 +73,21 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/var/lib/xkb
-%if %REPLACE_XORG_XKB_FILES
ln -snf /usr/bin/xkbcomp $RPM_BUILD_ROOT/usr/share/X11/xkb/xkbcomp
-%else
-ln -snf /usr/bin/xkbcomp $RPM_BUILD_ROOT/usr/share/X11/xkeyboard-config/xkbcomp
-%endif
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
-%if %REPLACE_XORG_XKB_FILES
%doc AUTHORS COPYING README docs/HOWTO.* docs/README.*
-%else
-%doc AUTHORS COPYING README docs/HOWTO.* docs/README.* README.SuSE
-%endif
%dir /var/lib/xkb
-%if %REPLACE_XORG_XKB_FILES
/usr/share/X11/xkb/
-%else
-/usr/share/X11/xkeyboard-config/
-%endif
%changelog -n xkeyboard-config
+* Tue Aug 01 2006 - sndirsch@xxxxxxx
+- added xorg-x11 to Requires/BuildRequires to fix build
+- cleanup
* Fri Jul 28 2006 - sndirsch@xxxxxxx
- use "-fno-strict-aliasing"
* Thu Jul 27 2006 - sndirsch@xxxxxxx
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
| < Previous | Next > |