rpms/fluxbox/FC-4 fluxbox-xdg-menu.py, NONE, 1.1 fluxbox.spec, 1.15, 1.16
Andreas Bierfert (awjb)
fedora-extras-commits at redhat.com
Tue Nov 29 15:56:06 UTC 2005
Author: awjb
Update of /cvs/extras/rpms/fluxbox/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14071/FC-4
Modified Files:
fluxbox.spec
Added Files:
fluxbox-xdg-menu.py
Log Message:
- enable nls and imlib2
- require artwizaleczepka instead of providing it...
- add menu script from Rudolf Kastel
(- devel: switch to modular x BR)
***** Error reading new file: [Errno 2] No such file or directory: 'fluxbox-xdg-menu.py'
Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-4/fluxbox.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fluxbox.spec 17 Sep 2005 07:38:59 -0000 1.15
+++ fluxbox.spec 29 Nov 2005 15:56:04 -0000 1.16
@@ -1,6 +1,6 @@
Name: fluxbox
Version: 0.9.14
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Window Manager based on Blackbox
@@ -12,14 +12,15 @@
Source1: Xclients.%{name}
Source2: FluxBox
Source3: fluxbox.desktop
-Source4: artwiz-aleczapka.tar.bz2
+Source4: fluxbox-xdg-menu.py
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
+BuildRequires: imlib2-devel
BuildRequires: xorg-x11-devel
-Buildrequires: zlib-devel
-Requires(post): chkfontpath
-Requires(postun): chkfontpath
+BuildRequires: zlib-devel
+Requires(post): python
+Requires: artwiz-aleczapka-fonts
%description
@@ -38,7 +39,9 @@
%configure --enable-xft \
--enable-gnome \
--enable-kde \
- --enable-xinerama
+ --enable-xinerama \
+ --enable-imlib2 \
+ --enable-nls
make %{?_smp_mflags}
@@ -49,44 +52,20 @@
# make gdm users happy
mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/switchdesk/
-install -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/apps/switchdesk/
+install -m 0755 -p %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/apps/switchdesk/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/Sessions
-install -m 0755 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/Sessions/
+install -m 0755 -p %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/Sessions/
# this is for Fedora Core
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions
-install -m 0755 %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
+install -m 0755 -p %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
-# artwiz fonts
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/X11/fonts/
-tar xjf %SOURCE4 -C $RPM_BUILD_ROOT%{_libdir}/X11/fonts/
+install -m 0755 -p %SOURCE4 $RPM_BUILD_ROOT%{_bindir}/fluxbox-xdg-menu
%post
# New menu-system
-%{_bindir}/fluxbox-generate_menu \
- -kg -in -ds\
- -p %{_usr} \
- -o %{_datadir}/fluxbox/menu \
- -m Fluxbox-0.9.14 2>&1 > /dev/null
-
-
-#artwiz fontz
-cd %{_libdir}/X11/fonts/artwiz-aleczapka
-fc-cache -f ./
-%{_sbindir}/chkfontpath -q -a %{_libdir}/X11/fonts/artwiz-aleczapka:unscaled
-
-tmp=`fgrep "<dir>%{_libdir}/X11/fonts/artwiz-aleczapka</dir>" %{_sysconfdir}/fonts/local.conf`
-if [ -z "$tmp" ];
- 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 %{_libdir}/X11/fonts/artwiz-aleczapka;
- sed -i "\%<dir>%{_libdir}/X11/fonts/artwiz-aleczapka</dir>%d" %{_sysconfdir}/fonts/local.conf
-fi
-
+%{_bindir}/fluxbox-xdg-menu --with-icons
%clean
rm -rf $RPM_BUILD_ROOT
@@ -102,9 +81,13 @@
%{_sysconfdir}/X11/gdm/Sessions/FluxBox
%{_sysconfdir}/X11/dm/Sessions/fluxbox.desktop
-%{_libdir}/X11/fonts/artwiz-aleczapka
-
%changelog
+* Thu Nov 10 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.14-2
+- enable nls and imlib2
+- require artwizaleczepka instead of providing it...
+- add menu script from Rudolf Kastel
+
* Thu Sep 15 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.9.14-1
- version upgrade
More information about the scm-commits
mailing list