rpms/blackbox/devel blackbox.session, NONE, 1.1 blackbox.spec, 1.15, 1.16

[Matthias Saou (thias)]

Author: thias

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

Modified Files:
	blackbox.spec 
Added Files:
	blackbox.session 
Log Message:
Moderate and minor fixes (disable /usr/lib64 rpath).



--- NEW FILE blackbox.session ---
#!/bin/sh
exec /etc/X11/xdm/Xsession blackbox


Index: blackbox.spec
===================================================================
RCS file: /cvs/extras/rpms/blackbox/devel/blackbox.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- blackbox.spec	28 Aug 2006 09:20:57 -0000	1.15
+++ blackbox.spec	29 Mar 2007 11:22:15 -0000	1.16
@@ -1,19 +1,22 @@
 Summary: Very small and fast Window Manager
 Name: blackbox
 Version: 0.70.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: User Interface/Desktops
 URL: http://blackboxwm.sourceforge.net/
-Source0: http://dl.sf.net/blackboxwm/blackbox-%{version}.tar.bz2
+Source0: http://downloads.sf.net/blackboxwm/blackbox-%{version}.tar.bz2
 Source1: blackbox.desktop
+Source2: blackbox.session
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 # Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora
 %if %{!?fedora:6}%{?fedora} >= 5
-BuildRequires: libXt-devel, libXext-devel
+BuildRequires: libXt-devel, libXext-devel, libXft-devel
 %else
 BuildRequires: xorg-x11-devel
 %endif
+# Required for autoreconf
+BuildRequires: automake, autoconf, libtool
 
 %description
 Blackbox is a window manager for the X Window environment, which is
@@ -27,7 +30,7 @@
 %package devel
 Summary: Blackbox Toolbox library for writing small applications
 Group: Development/Libraries
-Requires: pkgconfig
+Requires: %{name} = %{version}-%{release}, pkgconfig
 
 %description devel
 This package contains the Blackbox Toolbox files, headers and static library
@@ -35,11 +38,15 @@
 
 
 %prep
-%setup
+%setup -q
+# Required to cleanly get rid of the useless rpath
+autoreconf
 
 
 %build
-%configure
+%configure \
+    --enable-shared \
+    --disable-static
 %{__make} %{?_smp_mflags}
 
 
@@ -47,40 +54,56 @@
 %{__rm} -rf %{buildroot}
 %makeinstall
 
-# Install GDM session filee
-%{__mkdir_p} %{buildroot}/etc/X11/gdm/Sessions
-%{__cat} > %{buildroot}/etc/X11/gdm/Sessions/Blackbox << EOF
-#!/bin/sh
-exec /etc/X11/xdm/Xsession %{name}
-EOF
-
 # Install the desktop entry
 %{__install} -D -p -m 0644 %{SOURCE1} \
-    %{buildroot}%{_datadir}/xsessions/%{name}.desktop
+    %{buildroot}%{_datadir}/xsessions/blackbox.desktop
+
+# Install GDM session file
+%{__install} -D -p -m 0755 %{SOURCE2} \
+    %{buildroot}/etc/X11/gdm/Sessions/Blackbox
 
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
 %files
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog* COMPLIANCE LICENSE README* RELNOTES TODO
-%attr(755, root, root) /etc/X11/gdm/Sessions/Blackbox
-%{_bindir}/*
-%{_datadir}/%{name}/
-%{_datadir}/xsessions/%{name}.desktop
-%{_mandir}/man1/*
+/etc/X11/gdm/Sessions/Blackbox
+%{_bindir}/blackbox
+%{_bindir}/bsetbg
+%{_bindir}/bsetroot
+%{_bindir}/bstyleconvert
+%{_libdir}/libbt.so.*
+%{_datadir}/blackbox/
+%{_datadir}/xsessions/blackbox.desktop
+%{_mandir}/man1/blackbox.1*
+%{_mandir}/man1/bsetbg.1*
+%{_mandir}/man1/bsetroot.1*
 
 %files devel
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %{_includedir}/bt/
-%{_libdir}/libbt.a
 %exclude %{_libdir}/libbt.la
+%{_libdir}/libbt.so
 %{_libdir}/pkgconfig/libbt.pc
 
 
 %changelog
+* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 0.70.1-6
+- Switch to shared libbt library, so have devel require main and call ldconfig.
+- Make the GDM session file be a separate source.
+- Autoreconf to cleanly get rid of the useless rpath.
+- Add missing libXft-devel build requirement.
+- Switch to using downloads.sf.net source URL.
+- Minor spec file tweaks.
+
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 0.70.1-5
 - FC6 rebuild.
 - Remove gcc-c++ build requirement and devel sub-package requirement.