- more %%{__make} macros.

[packages/Xconfigurator.git] / Xconfigurator.spec

diff --git a/Xconfigurator.spec b/Xconfigurator.spec
index 844d1c84e0b089b96ffe2dbea11a8cfe02c41f2d..e608d75ba999c0c801416a8830e53ab750cdc348 100644 (file)
--- a/Xconfigurator.spec
+++ b/Xconfigurator.spec
@@ -1,29 +1,32 @@
-Summary:     Red Hat X Window System Configuration tool
-Summary(pl): Narzêdzie do konfiguracji X Window System
-Name:        Xconfigurator
-Version:     3.84
-Release:     3
-Copyright:   distributable
-Group:       X11/Utilities
-Group(pl):   X11/Narzêdzia
-Source:      %{name}-%{version}.tar.gz
-Patch:       Xconfigurator-config.patch
-Requires:    XFree86 >= 3.3.2,  kbdconfig, mouseconfig >= 2.8, kbd
-Requires:    initscripts >= 3.60
-ExcludeArch: sparc
-BuildRoot:     /tmp/%{name}-%{version}-root
+Summary:       Red Hat X Window System Configuration tool
+Summary(pl):   Narzêdzie do konfiguracji X Window System
+Name:          Xconfigurator
+Version:       4.2.3
+Release:       1
+Copyright:     distributable
+Group:         X11/Utilities
+Group(pl):     X11/Narzêdzia
+Source0:       %{name}-%{version}.tar.gz
+Patch0:                Xconfigurator-config.patch
+Requires:      XFree86 >= 3.3.2,  kbdconfig, mouseconfig >= 2.8, kbd
+#Requires:     initscripts >= 3.60
+ExcludeArch:   sparc
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%define                _prefix /usr/X11R6
+%define                _mandir /usr/X11R6/man
 
 %description
-This is the Red Hat X Configuration tool.  It is based on the sources
-for xf86config, a utility from XFree86.  It has a nicer user interface
+This is the Red Hat X Configuration tool. It is based on the sources
+for xf86config, a utility from XFree86. It has a nicer user interface
 added to make it easier for the end user.
 
-NOTE - use mouseconfig to change your mouse type, then re-run Xconfigurator
-to set X up for your new mouse type.
+NOTE - use mouseconfig to change your mouse type, then re-run
+Xconfigurator to set X up for your new mouse type.
 
 %description -l pl
-Narzêdzie do konfiguracji X Window System stworzone przez firmê Red Hat
-Software. Jest oparte na xf86config - narzêdziu z XFree86. Ma
+Narzêdzie do konfiguracji X Window System stworzone przez firmê Red
+Hat Software. Jest oparte na xf86config - narzêdziu z XFree86. Ma
 przyjemniejszy interfejs i jest ³atwiejszy w obs³udze.
 
 %prep
@@ -31,15 +34,16 @@ przyjemniejszy interfejs i jest 
 %patch -p1
 
 %build
-make
-strip Xconfigurator
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make PREFIX=$RPM_BUILD_ROOT install
 
-gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/Xconfigurator.1x
-gzip -9nf README TODO
+strip Xconfigurator
+%{__make} PREFIX=$RPM_BUILD_ROOT install
+
+gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/* \
+       README TODO
 
 %find_lang %{name}
 
@@ -49,6 +53,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc {README,TODO}.gz
-%attr(755,root,root) /usr/X11R6/bin/Xconfigurator
-/usr/X11R6/share/Xconfigurator
-/usr/X11R6/man/man1/Xconfigurator.1x.gz
+%attr(755,root,root) %{_bindir}/Xconfigurator
+%attr(755,root,root) %{_bindir}/Xtest
+%{_datadir}/Xconfigurator
+%{_mandir}/man1/Xconfigurator.1x.gz