rpms/blackbox/devel blackbox-0.65.0-assert.patch, NONE, 1.1 blackbox-0.65.0-gcc34.patch, NONE, 1.1 blackbox.desktop, 1.2, 1.3 blackbox.spec, 1.4, 1.5

[Matthias Saou (thias)]

Changeset from: thias

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

Modified Files:
	blackbox.spec 
Added Files:
	blackbox-0.65.0-assert.patch blackbox-0.65.0-gcc34.patch 
	blackbox.desktop 
Log Message:
Merge my current changes, including required patch for gcc 3.4.


blackbox-0.65.0-assert.patch:

--- NEW FILE blackbox-0.65.0-assert.patch ---
--- 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"

blackbox-0.65.0-gcc34.patch:

--- NEW FILE blackbox-0.65.0-gcc34.patch ---
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(); }


Index: blackbox.desktop
===================================================================
RCS file: blackbox.desktop
diff -N blackbox.desktop
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ blackbox.desktop	16 Nov 2004 17:08:40 -0000	1.3
@@ -0,0 +1,84 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Blackbox
+Name[az]=Blackbox
+Name[be]=Blackbox
+Name[ca]=Blackbox
+Name[cs]=Blackbox
+Name[cy]=Blackbox
+Name[da]=Blackbox
+Name[de]=Blackbox
+Name[el]=Blackbox
+Name[es]=Blackbox
+Name[et]=Blackbox
+Name[fi]=Blackbox
+Name[fr]=Blackbox
+Name[he]=Blackbox
+Name[hi]=Blackbox
+Name[hu]=Blackbox
+Name[it]=Blackbox
+Name[ja]=Blackbox
+Name[ko]=Blackbox
+Name[ms]=Blackbox
+Name[nl]=Blackbox
+Name[nn]=Blackbox
+Name[no]=Blackbox
+Name[pl]=Blackbox
+Name[pt]=Blackbox
+Name[pt_BR]=Blackbox
+Name[ro]=Blackbox
+Name[ru]=Blackbox
+Name[sk]=Blackbox
+Name[sl]=Blackbox
+Name[sq]=Blackbox
+Name[sr]=Blackbox
+Name[sr at Latn]=Blackbox
+Name[sv]=Blackbox
+Name[tr]=Blackbox
+Name[uk]=Blackbox
+Name[vi]=Blackbox
+Name[wa]=Blackbox
+Name[zh_CN]=Blackbox
+Name[zh_TW]=Blackbox
+Comment=This session logs you into Blackbox
+Comment[az]=Bu iclas sizi Blackbox'a daxil edəcək
+Comment[be]=Гэтая сэсыя завядзе вас у Blackbox
+Comment[ca]=Aquesta sessió entra en Blackbox
+Comment[cs]=Toto sezení vás přihlásí do Blackbox
+Comment[cy]=Mae'r sesiwn hwn yn eich mewngofnodi i Blackbox
+Comment[da]=Denne session logger dig på Blackbox
+Comment[de]=Diese Sitzung meldet Sie an Blackbox an
+Comment[el]=Αυτή η συνεδρία σας εισάγει στο Blackbox
+Comment[es]=Con esta sesión accede a Blackbox
+Comment[fi]=Tämä istunto kirjaa sisään Blackboxen
+Comment[fr]=Cette session vous connectera dans Blackbox
+Comment[he]=תצורת הפעלה זו מחברת אותך ל Blackbox
+Comment[hi]=यह सत्र गनोम में लॉगिन होगा
+Comment[hu]=Ez a munkamenet a Blackbox-ba jelentkeztet be
+Comment[it]=Sessione di lavoro con Blackbox
+Comment[ja]=Blackbox セッションにログインします
+Comment[ko]=Blackbox세션으로 로그인합니다
+Comment[ms]=Sesi ini akan log anda  ke Blackbox
+Comment[nl]=Deze sessie meldt u aan bij Blackbox
+Comment[nn]=Denne økta loggar på Blackbox
+Comment[no]=Denne sesjonen logger deg inn til Blackbox
+Comment[pl]=Sesja logowania do Blackbox
+Comment[pt]=Esta sessão inicia-o no Blackbox
+Comment[pt_BR]=Logar no ambiente Blackbox
+Comment[ro]=Această sesiune vă va loga în Blackbox
+Comment[sk]=Toto sedenie vás prihlási do prostredia Blackbox
+Comment[sl]=Ta seja vas prijavi v Blackbox
+Comment[sq]=Kjo seancë do t'ju fusë në Blackbox
+Comment[sr]=Ова сесија вас пријављује на Blackbox
+Comment[sr at Latn]=Ova sesija vas prijavljuje na Blackbox
+Comment[sv]=Denna session loggar in dig i Blackbox
+Comment[tr]=Bu oturum ile Blackbox'a giriş yaparsınız
+Comment[uk]=Сеанс роботи в середовищі Blackbox
+Comment[vi]=Session nà y cho bạn đăng nhập và o Blackbox
+Comment[zh_CN]=此会话使您登录到 Blackbox
+Comment[zh_TW]=選取這個作業階段後會進入 Blackbox 環境
+Exec=blackbox
+TryExec=blackbox
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application


Index: blackbox.spec
===================================================================
RCS file: /cvs/extras/rpms/blackbox/devel/blackbox.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- blackbox.spec	9 Nov 2004 02:44:31 -0000	1.4
+++ blackbox.spec	16 Nov 2004 17:08:40 -0000	1.5
@@ -1,17 +1,19 @@
 # $Id$
+# Authority: matthias
 
-Summary: Very small and fast Window Manager.
+Summary: Very small and fast Window Manager
 Name: blackbox
 Version: 0.65.0
-Release: fr2
-Epoch: 0
+Release: 10
 License: GPL
 Group: User Interface/Desktops
-Source: http://prdownloads.sf.net/blackboxwm/blackbox-%{version}.tar.gz
 URL: http://blackboxwm.sourceforge.net/
-BuildRoot: %{_tmppath}/%{name}-root
-Requires: XFree86, libstdc++
-BuildRequires: XFree86-devel, libstdc++-devel
+Source0: http://dl.sf.net/blackboxwm/blackbox-%{version}.tar.gz
+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++
 
 %description
 Blackbox is a window manager for the X Window environment, which is
@@ -21,46 +23,85 @@
 gradients and bevels is used to draw window decorations. Remaining
 small in size, blackbox preserves memory and CPU.
 
+
 %prep
-%setup -q
+%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}
+%{__make} %{?_smp_mflags}
+
 
 %install
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 %makeinstall
-mkdir -p %{buildroot}%{_datadir}/apps/switchdesk
-cat > %{buildroot}%{_datadir}/apps/switchdesk/Xclients.%{name} << EOF
-#!/bin/sh
-exec %{_bindir}/%{name}
-EOF
-mkdir -p %{buildroot}/etc/X11/gdm/Sessions
-cat > %{buildroot}/etc/X11/gdm/Sessions/Blackbox << EOF
+
+# 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} -m 644 -D %{SOURCE1} \
+    %{buildroot}%{_datadir}/xsessions/%{name}.desktop
+
+
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
+
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog* LICENSE README*
 %attr(755, root, root) /etc/X11/gdm/Sessions/Blackbox
 %{_bindir}/*
 %{_datadir}/%{name}
-%attr(755, root, root) %{_datadir}/apps/switchdesk/Xclients.%{name}
+%{_datadir}/xsessions/%{name}.desktop
 %{_mandir}/man1/*
 
+
 %changelog
-* Sun Oct  6 2002 Matthias Saou <matthias.saou at est.une.marmotte.net>
+* Tue Nov 16 2004 Mattthias Saou <http://freshrpms.net/> 0.65.0-10
+- Bump release to provide Extras upgrade path.
+
+* Mon Nov 15 2004 Mattthias Saou <http://freshrpms.net/> 0.65.0-9
+- Added gcc 3.4 patch from Arch Linux.
+
+* Thu May  6 2004 Mattthias Saou <http://freshrpms.net/> 0.65.0-8
+- Removed switchdesk file, it doesn't work because of hardcoded stuff.
+
+* Wed Mar 24 2004 Mattthias Saou <http://freshrpms.net/> 0.65.0-8
+- Removed explicit XFree86 dependency.
+
+* Mon Feb 23 2004 Mattthias Saou <http://freshrpms.net/> 0.65.0-7
+- Added blackbox.desktop file for xsessions based on the GNOME one.
+
+* Tue Feb 10 2004 Scott R. Godin <nospam at webdragon.net> 0.65.0-6
+- Patch for #include <cassert> in Window.cc
+- Fixed nls problem, left in --disable just in case. Smile, Matthias. :-) 
+
+* Fri Nov 14 2003 Mattthias Saou <http://freshrpms.net/> 0.65.0-5
+- Rebuild for Fedora Core 1.
+
+* Wed May 14 2003 Matthias Saou <http://freshrpms.net/>
+- Added --without nls to enable rebuilding on Red Hat Linux 9 :-(
+
+* Mon Mar 31 2003 Matthias Saou <http://freshrpms.net/>
+- Rebuilt for Red Hat Linux 9.
+
+* Sun Oct  6 2002 Matthias Saou <http://freshrpms.net/>
 - Rebuilt for Red Hat Linux 8.0.
 
-* Fri Sep 20 2002 Matthias Saou <matthias.saou at est.une.marmotte.net>
+* Fri Sep 20 2002 Matthias Saou <http://freshrpms.net/>
 - Update to 0.65.0 final.
 
-* Mon Aug 12 2002 Matthias Saou <matthias.saou at est.une.marmotte.net>
+* Mon Aug 12 2002 Matthias Saou <http://freshrpms.net/>
 - Initial RPM release.