rpms/xdaliclock/devel xdaliclock.spec,1.3,1.4

[Chris Ricker (kaboom)]

Author: kaboom

Update of /cvs/extras/rpms/xdaliclock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12857

Modified Files:
	xdaliclock.spec 
Log Message:
Fix paths for modular X



Index: xdaliclock.spec
===================================================================
RCS file: /cvs/extras/rpms/xdaliclock/devel/xdaliclock.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xdaliclock.spec	15 Feb 2006 17:05:03 -0000	1.3
+++ xdaliclock.spec	15 Feb 2006 17:56:46 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A clock for the X Window System
 Name: xdaliclock
 Version: 2.23
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Amusements/Graphics
 License: BSD
 URL: http://www.jwz.org/xdaliclock/
@@ -31,15 +31,15 @@
 rm -rf $RPM_BUILD_ROOT
 cd X11
 
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/man/man1
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
 
-install -p -m 0755 xdaliclock $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
+install -p -m 0755 xdaliclock $RPM_BUILD_ROOT%{_bindir}
 install -p -m 0755 xdaliclock.man \
-	$RPM_BUILD_ROOT%{_prefix}/X11R6/man/man1/xdaliclock.1
+	$RPM_BUILD_ROOT%{_mandir}/man1/xdaliclock.1
 install -p -m 0644 XDaliClock.ad \
-	$RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/XDaliClock
+	$RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/XDaliClock
 
 desktop-file-install --vendor fedora \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -54,12 +54,15 @@
 %files
 %defattr(-,root,root)
 %doc README
-%{_prefix}/X11R6/bin/xdaliclock
-%{_prefix}/X11R6/man/man1/xdaliclock.1*
-%{_libdir}/X11/app-defaults/XDaliClock
+%{_bindir}/xdaliclock
+%{_mandir}/man1/xdaliclock.1*
+%{_datadir}/X11/app-defaults/XDaliClock
 %{_datadir}/applications/*
 
 %changelog
+* Wed Feb 15 2006 Chris Ricker <kaboom at oobleck.net> 2.23-2
+- Really update for modular X
+
 * Wed Feb 15 2006 Chris Ricker <kaboom at oobleck.net> 2.23-1
 - New release
 - Update for modular X