- fix tor place correctly desktop file in Settings.

[packages/xkeycaps.git] / xkeycaps.spec

diff --git a/xkeycaps.spec b/xkeycaps.spec
index 8f462d6767c8554ff23202b68d75a80bfd833bce..24b06a3aab54edf4fc5f08f5656b80c6bd305df8 100644 (file)
--- a/xkeycaps.spec
+++ b/xkeycaps.spec
@@ -2,12 +2,13 @@ Summary:      xkeycaps - a keymap editor for the X Window System
 Summary(pl):   xkeycaps - edytor mapy klawiatury dla X Window System
 Name:          xkeycaps
 Version:       2.46
-Release:       1
+Release:       3
 License:       BSD
 Group:         X11/Applications
+Group(de):     X11/Applikationen
 Group(pl):     X11/Aplikacje
 Source0:       http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z
-Source1:       xkeycaps.desktop
+Source1:       %{name}.desktop
 URL:           http://www.jwz.org/xkeycaps/
 BuildRequires: XFree86-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -39,24 +40,21 @@ xmodmapa.
 
 %build
 xmkmf -a
-%{__make}      DEFAULT_KBD_NAME="L101" \
-       CDEBUGFLAGS="$RPM_OPT_FLAGS"
+%{__make} DEFAULT_KBD_NAME="L101" \
+       CDEBUGFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_applnkdir}/Utilities
+install -d $RPM_BUILD_ROOT%{_applnkdir}/Settings
 
 %{__make} install install.man \
        DESTDIR=$RPM_BUILD_ROOT \
         MANDIR=%{_mandir}/man1 \
         BINDIR=%{_bindir} 
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Utilities
+install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Settings
 
-strip $RPM_BUILD_ROOT%{_bindir}/*
-
-gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/* \
-       README defining.txt
+gzip -9nf README defining.txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -64,6 +62,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc *.gz
-%{_applnkdir}/Utilities/xkeycaps.desktop
+%{_applnkdir}/Settings/xkeycaps.desktop
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man1/*