rpms/fluxbox/FC-4 Xclients.fluxbox,1.2,1.3 fluxbox.spec,1.13,1.14

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/extras/rpms/fluxbox/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25604/FC-4

Modified Files:
	Xclients.fluxbox fluxbox.spec 
Log Message:
- fix #167601



Index: Xclients.fluxbox
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-4/Xclients.fluxbox,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Xclients.fluxbox	8 Nov 2004 04:19:32 -0000	1.2
+++ Xclients.fluxbox	9 Sep 2005 08:07:40 -0000	1.3
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec /usr/X11R6/bin/fluxbox
+exec /usr/bin/fluxbox


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-4/fluxbox.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fluxbox.spec	16 Jun 2005 06:29:10 -0000	1.13
+++ fluxbox.spec	9 Sep 2005 08:07:40 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           fluxbox
 Version:        0.9.13
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -35,10 +35,7 @@
 %setup -q
 
 %build
-
-%configure      --bindir=%{_prefix}/X11R6/bin \
-                --mandir=%{_prefix}/X11R6/man \
-                --enable-xft \
+%configure      --enable-xft \
                 --enable-gnome \
                 --enable-kde \
                 --enable-xinerama \
@@ -49,8 +46,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall     bindir=$RPM_BUILD_ROOT/%{_prefix}/X11R6/bin \
-                 mandir=$RPM_BUILD_ROOT/%{_prefix}/X11R6/man
+%makeinstall
 
 # make gdm users happy
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/switchdesk/
@@ -64,12 +60,12 @@
 install -m 0755 %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
 
 # artwiz fonts
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/fonts/
-tar xjf %SOURCE4 -C $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/fonts/
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/X11/fonts/
+tar xjf %SOURCE4 -C $RPM_BUILD_ROOT%{_libdir}/X11/fonts/
 
 %post
 # New menu-system
-%{_prefix}/X11R6/bin/fluxbox-generate_menu \
+%{_bindir}/fluxbox-generate_menu \
 	-kg -in -ds\
 	-p %{_usr} \
 	-o %{_datadir}/fluxbox/menu \
@@ -77,19 +73,19 @@
 
 
 #artwiz fontz
-cd %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka
+cd %{_libdir}/X11/fonts/artwiz-aleczapka
 fc-cache -f ./
-%{_sbindir}/chkfontpath -q -a %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka:unscaled
+%{_sbindir}/chkfontpath -q -a %{_libdir}/X11/fonts/artwiz-aleczapka:unscaled
 
-tmp=`fgrep "<dir>%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka</dir>" %{_sysconfdir}/fonts/local.conf`
+tmp=`fgrep "<dir>%{_libdir}/X11/fonts/artwiz-aleczapka</dir>" %{_sysconfdir}/fonts/local.conf`
 if [ -z "$tmp" ];
-	then sed -i "s,</fontconfig>,<dir>%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka</dir>\n</fontconfig>," %{_sysconfdir}/fonts/local.conf
+	then sed -i "s,</fontconfig>,<dir>%{_libdir}/X11/fonts/artwiz-aleczapka</dir>\n</fontconfig>," %{_sysconfdir}/fonts/local.conf
 fi
 
 %postun
 if [ "$1" -eq "0" ]; then # complete removal, not upgrade
-	%{_sbindir}/chkfontpath -q -r %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka;
-	sed -i "\%<dir>%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka</dir>%d" %{_sysconfdir}/fonts/local.conf
+	%{_sbindir}/chkfontpath -q -r %{_libdir}/X11/fonts/artwiz-aleczapka;
+	sed -i "\%<dir>%{_libdir}/X11/fonts/artwiz-aleczapka</dir>%d" %{_sysconfdir}/fonts/local.conf
 fi
 
 
@@ -99,17 +95,21 @@
 %files
 %defattr(-,root,root,755)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-%{_prefix}/X11R6/bin/*
-%{_prefix}/X11R6/man/man1/*
+%{_bindir}/*
+%{_mandir}/man1/*
 %{_datadir}/%{name}
 %{_datadir}/apps/switchdesk/Xclients.fluxbox
 
 %{_sysconfdir}/X11/gdm/Sessions/FluxBox
 %{_sysconfdir}/X11/dm/Sessions/fluxbox.desktop
 
-%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka
+%{_libdir}/X11/fonts/artwiz-aleczapka
 
 %changelog
+* Tue Sep 06 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.13-4
+- remove X11R6 path stuff #167601
+
 * Thu Jun 16 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.13-3.fc4
 - fix #160614