[svn] r3074 - in trunk/rpms: bbkeys blackbox

svn-commits at lists.rpmforge.net svn-commits at lists.rpmforge.net
Fri Apr 1 20:39:23 CEST 2005


Author: thias
Date: 2005-04-01 20:39:21 +0200 (Fri, 01 Apr 2005)
New Revision: 3074

Removed:
   trunk/rpms/blackbox/blackbox-0.65.0-assert.patch
   trunk/rpms/blackbox/blackbox-0.65.0-gcc34.patch
Modified:
   trunk/rpms/bbkeys/bbkeys.spec
   trunk/rpms/blackbox/blackbox.spec
Log:
Update to blackbox 0.70.0 and bbkeys 0.9.0.


Modified: trunk/rpms/bbkeys/bbkeys.spec
===================================================================
--- trunk/rpms/bbkeys/bbkeys.spec	2005-04-01 17:19:01 UTC (rev 3073)
+++ trunk/rpms/bbkeys/bbkeys.spec	2005-04-01 18:39:21 UTC (rev 3074)
@@ -3,14 +3,14 @@
 
 Summary: Completely configurable key-combo grabber for blackbox
 Name: bbkeys
-Version: 0.8.6
-Release: 3
+Version: 0.9.0
+Release: 1
 License: GPL
 Group: User Interface/Desktops
 URL: http://bbkeys.sourceforge.net/
 Source: http://dl.sf.net/bbkeys/bbkeys-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: XFree86-devel, gcc-c++
+BuildRequires: blackbox-devel, XFree86-devel
 
 %description
 bbkeys is a configurable key-grabber designed for the blackbox window manager
@@ -32,8 +32,8 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
-# Clean this up, we don't want to package it
-%{__rm} -rf %{buildroot}%{_prefix}/doc
+# Clean this up, we package the exact same files cleanly in %%doc
+%{__rm} -rf %{buildroot}%{_datadir}/doc/bbkeys/
 
 
 %clean
@@ -42,14 +42,18 @@
 
 %files 
 %defattr(-, root, root, 0755) 
-%doc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
-%{_bindir}/*
-%dir %{_datadir}/bbtools
-%config %{_datadir}/bbtools/*
+%doc AUTHORS BUGS ChangeLog LICENSE NEWS README TODO
+%{_bindir}/bbkeys
+%dir %{_datadir}/bbkeys/
+%config %{_datadir}/bbkeys/bbkeysrc
+%config %{_datadir}/bbkeys/defaultStyle
 %{_mandir}/man?/*
 
  
 %changelog 
+* Fri Apr  1 2005 Matthias Saou <http://freshrpms.net/> 0.9.0-1
+- Update to 0.9.0.
+
 * Tue May 18 2004 Matthias Saou <http://freshrpms.net/> 0.8.6-4
 - Rebuild for Fedora Core 2.
 

Deleted: trunk/rpms/blackbox/blackbox-0.65.0-assert.patch
===================================================================
--- trunk/rpms/blackbox/blackbox-0.65.0-assert.patch	2005-04-01 17:19:01 UTC (rev 3073)
+++ trunk/rpms/blackbox/blackbox-0.65.0-assert.patch	2005-04-01 18:39:21 UTC (rev 3074)
@@ -1,10 +0,0 @@
---- src/Window.cc.orig	2002-09-17 11:23:35.000000000 -0400
-+++ src/Window.cc	    2004-02-10 20:44:23.000000000 -0500
-@@ -44,6 +44,7 @@
- #endif // HAVE_STDLIB_H
- }
- 
-+#include <cassert>
- #include "i18n.hh"
- #include "blackbox.hh"
- #include "GCCache.hh"

Deleted: trunk/rpms/blackbox/blackbox-0.65.0-gcc34.patch
===================================================================
--- trunk/rpms/blackbox/blackbox-0.65.0-gcc34.patch	2005-04-01 17:19:01 UTC (rev 3073)
+++ trunk/rpms/blackbox/blackbox-0.65.0-gcc34.patch	2005-04-01 18:39:21 UTC (rev 3074)
@@ -1,16 +0,0 @@
-diff -Naur blackbox-0.65.0.orig/src/Timer.hh blackbox-0.65.0/src/Timer.hh
---- blackbox-0.65.0.orig/src/Timer.hh	2002-08-23 14:50:54.000000000 -0400
-+++ blackbox-0.65.0/src/Timer.hh	2004-04-11 01:23:27.000000000 -0400
-@@ -98,9 +98,10 @@
-   ~_timer_queue(void) {}
- 
-   void release(const _Tp& value) {
--    c.erase(std::remove(c.begin(), c.end(), value), c.end());
-+    _Base::c.erase(std::remove(_Base::c.begin(), _Base::c.end(), value),
-+			_Base::c.end());
-     // after removing the item we need to make the heap again
--    std::make_heap(c.begin(), c.end(), comp);
-+    std::make_heap(_Base::c.begin(), _Base::c.end(), _Base::comp);
-   }
-   bool empty(void) const { return _Base::empty(); }
-   size_t size(void) const { return _Base::size(); }

Modified: trunk/rpms/blackbox/blackbox.spec
===================================================================
--- trunk/rpms/blackbox/blackbox.spec	2005-04-01 17:19:01 UTC (rev 3073)
+++ trunk/rpms/blackbox/blackbox.spec	2005-04-01 18:39:21 UTC (rev 3074)
@@ -3,15 +3,13 @@
 
 Summary: Very small and fast Window Manager
 Name: blackbox
-Version: 0.65.0
-Release: 9
+Version: 0.70.0
+Release: 1
 License: GPL
 Group: User Interface/Desktops
 URL: http://blackboxwm.sourceforge.net/
-Source0: http://dl.sf.net/blackboxwm/blackbox-%{version}.tar.gz
+Source0: http://dl.sf.net/blackboxwm/blackbox-%{version}.tar.bz2
 Source1: blackbox.desktop
-Patch0: blackbox-0.65.0-assert.patch
-Patch1: blackbox-0.65.0-gcc34.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: XFree86-devel, gcc-c++
 
@@ -24,15 +22,21 @@
 small in size, blackbox preserves memory and CPU.
 
 
+%package devel
+Summary: Blackbox Toolbox library for writing small applications
+Group: Development/Libraries
+Requires: gcc-c++, pkgconfig
+
+%description devel
+This package contains the Blackbox Toolbox files, headers and static library
+of the utility class library for writing small applications.
+
+
 %prep
 %setup
-%patch0 -p0 -b .assert
-%patch1 -p1 -b .gcc34
 
 
 %build
-# Work around NLS problem
-export LANG="en_US" LC_ALL="en_US"
 %configure
 %{__make} %{?_smp_mflags}
 
@@ -59,15 +63,27 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc AUTHORS ChangeLog* LICENSE README*
+%doc AUTHORS ChangeLog* COMPLIANCE LICENSE README* RELNOTES TODO
 %attr(755, root, root) /etc/X11/gdm/Sessions/Blackbox
 %{_bindir}/*
-%{_datadir}/%{name}
+%{_datadir}/%{name}/
 %{_datadir}/xsessions/%{name}.desktop
 %{_mandir}/man1/*
 
+%files devel
+%defattr(-, root, root, 0755)
+%{_includedir}/bt/
+%{_libdir}/libbt.a
+%exclude %{_libdir}/libbt.la
+%{_libdir}/pkgconfig/libbt.pc
 
+
 %changelog
+* Sat Mar 12 2005 Mattthias Saou <http://freshrpms.net/> 0.70.0-1
+- Update to 0.70.0.
+- Use bz2 source instead of gz.
+- Add devel sub-package for the libbt stuff.
+
 * Mon Nov 15 2004 Mattthias Saou <http://freshrpms.net/> 0.65.0-9
 - Added gcc 3.4 patch from Arch Linux.
 




More information about the commits mailing list