- mass commit: cosmetics (removed trailing white spaces)

[packages/Xconfigurator.git] / Xconfigurator.spec

diff --git a/Xconfigurator.spec b/Xconfigurator.spec
index 3d30d9b4c6cdfdb8cbac2d1cb51e24611d486050..2de11179f2aa3d834a5dc108695a01fbd91883d1 100644 (file)
--- a/Xconfigurator.spec
+++ b/Xconfigurator.spec
@@ -1,48 +1,54 @@
 Summary:       Red Hat X Window System Configuration tool
 Summary(pl):   Narzêdzie do konfiguracji X Window System
 Name:          Xconfigurator
-Version:       4.2.3
+Version:       4.10.7
 Release:       1
-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
+License:       distributable
+Group:         X11/Applications
+Source0:       %{name}-%{version}.tar.bz2
+# Source0-md5: 13b8af4364419e959396df2b1f50d87e
+#Patch0:               %{name}-config.patch
+Patch1:                %{name}-kudzu.patch
 #Requires:     initscripts >= 3.60
+BuildRequires: gdk-pixbuf-devel
+BuildRequires: gnome-libs-devel
+BuildRequires: kudzu-devel
+Requires:      XFree86 >= 3.3.2
+Requires:      kbd
+Requires:      kbdconfig
+Requires:      mouseconfig >= 2.8
 ExcludeArch:   sparc
-BuildRoot:     /tmp/%{name}-%{version}-root
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix /usr/X11R6
-%define                _mandir /usr/X11R6/man
+%define                _mandir %{_prefix}/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
 %setup -q
-%patch -p1
+#%patch0 -p1
+%patch1 -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
+%{__make} install \
+       PREFIX=$RPM_BUILD_ROOT
 
 %find_lang %{name}
 
@@ -51,8 +57,8 @@ 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
-%attr(755,root,root) /usr/X11R6/bin/Xtest
-/usr/X11R6/share/Xconfigurator
-/usr/X11R6/man/man1/Xconfigurator.1x.gz
+%doc README TODO
+%attr(755,root,root) %{_bindir}/Xconfigurator
+%attr(755,root,root) %{_bindir}/Xtest
+%{_datadir}/Xconfigurator
+%{_mandir}/man1/Xconfigurator.1x*