rpms/fluxbox/FC-3 Xclients.fluxbox,1.2,1.3 fluxbox.spec,1.9,1.10
Andreas Bierfert (awjb)
fedora-extras-commits at redhat.com
Fri Sep 9 08:07:40 UTC 2005
- Previous message (by thread): rpms/scim/FC-3 scim-add-restart.patch, NONE, 1.1 scim-gtk-langs-167090.patch, NONE, 1.1 scim.spec, 1.14, 1.15 update-xinput-scim, 1.1, NONE
- Next message (by thread): rpms/fluxbox/FC-4 Xclients.fluxbox,1.2,1.3 fluxbox.spec,1.13,1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: awjb
Update of /cvs/extras/rpms/fluxbox/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25604/FC-3
Modified Files:
Xclients.fluxbox fluxbox.spec
Log Message:
- fix #167601
Index: Xclients.fluxbox
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-3/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:38 -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-3/fluxbox.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fluxbox.spec 16 Jun 2005 06:29:33 -0000 1.9
+++ fluxbox.spec 9 Sep 2005 08:07:38 -0000 1.10
@@ -1,21 +1,23 @@
-Name: fluxbox
-Version: 0.9.13
-Release: 3%{?dist}
-Summary: Fluxbox is a windowmanager that is based on Blackbox.
-
-Group: User Interface/Desktops
-License: MIT
-URL: http://fluxbox.sourceforge.net
-Source0: http://download.sourceforge.net/fluxbox/fluxbox-0.9.13.tar.bz2
-Source1: Xclients.%{name}
-Source2: FluxBox
-Source3: fluxbox.desktop
-Source4: artwiz-aleczapka.tar.bz2
+Name: fluxbox
+Version: 0.9.13
+Release: 4%{?dist}
+
+Summary: Window Manager based on Blackbox
+
+Group: User Interface/Desktops
+License: MIT
+URL: http://fluxbox.sourceforge.net
+
+Source0: http://download.sourceforge.net/fluxbox/fluxbox-0.9.13.tar.bz2
+Source1: Xclients.%{name}
+Source2: FluxBox
+Source3: fluxbox.desktop
+Source4: artwiz-aleczapka.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
BuildRequires: xorg-x11-devel
-Buildrequires: zlib-devel
-Requires(post): chkfontpath
+Buildrequires: zlib-devel
+Requires(post): chkfontpath
Requires(postun): chkfontpath
@@ -33,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 \
@@ -47,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/
@@ -62,32 +60,32 @@
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 \
- -kg -in -ds \
+%{_bindir}/fluxbox-generate_menu \
+ -kg -in -ds\
-p %{_usr} \
-o %{_datadir}/fluxbox/menu \
-m Fluxbox-0.9.13 2>&1 > /dev/null
#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
@@ -97,28 +95,38 @@
%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.fc3
-- fix #160614
+0.9.13-3.fc4
+- fix #160614
* Wed Jun 08 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-0.9.13-2.fc3
+0.9.13-2.fc4
- fix generate menu bug and revisit switches
* Tue May 31 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- upgrade to 0.9.13
+* Wed Apr 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.9-4
+- Fix build for GCC 4.
+
+* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
* Sat Nov 13 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.9-2
- Fix build for GCC 3.4.
- Previous message (by thread): rpms/scim/FC-3 scim-add-restart.patch, NONE, 1.1 scim-gtk-langs-167090.patch, NONE, 1.1 scim.spec, 1.14, 1.15 update-xinput-scim, 1.1, NONE
- Next message (by thread): rpms/fluxbox/FC-4 Xclients.fluxbox,1.2,1.3 fluxbox.spec,1.13,1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list