X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=blackbox.spec;h=1ebe7dd5ee18319d95245b9fab8a48e1ccea7451;hb=13f3130c192cef7e0a8275257f93cdddacddfaeb;hp=5422bd429356de54e28bcd31c6808d31a887437e;hpb=81d578d1c26a6afd84e8fc000c041de29bf569aa;p=packages%2Fblackbox.git

diff --git a/blackbox.spec b/blackbox.spec
index 5422bd4..1ebe7dd 100644
--- a/blackbox.spec
+++ b/blackbox.spec
@@ -2,21 +2,26 @@ Summary:	Very small and fast window manger for the X Window
 Summary(pl):	Ma³y i szybki menad¿er okien dla X Window
 Name:		blackbox
 Version:	0.61.1
-Release:	1
+Release:	4
 License:	GPL
 Group:		X11/Window Managers
 Group(de):	X11/Fenstermanager
 Group(pl):	X11/Zarz±dcy Okien
 Vendor:		Brad Hughes <blackbox@alug.org>
 Source0:	ftp://portal.alug.org/pub/blackbox/0.6x.x/%{name}-%{version}.tar.bz2
+Source1:	%{name}.desktop
+Patch0:		%{name}-lowcase_name.patch
+Patch1:		%{name}-exitbutton.patch
+Patch2:		%{name}-am_fixes.patch
 URL:		http://blackbox.alug.org/
-BUildRequires:	XFree86-devel
-BUildRequires:	libstdc++-devel
+BuildRequires:	XFree86-devel
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_prefix		/usr/X11R6
-%define		_mandir		/usr/X11R6/man
-%define		_datadir	/etc/X11
+%define		_mandir		%{_prefix}/man
+%define		_sysconfdir	/etc/X11/%{name}
 
 %description
 Blackbox is a window manager for the X Window environment, which is
@@ -35,17 +40,25 @@ gradientowe lub tr
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-CXXFLAGS="%{?debug:-O -g}%{!?debug:$RPM_OPT_FLAGS} -fno-exceptions -fno-rtti -fno-implicit-templates"
+aclocal
+autoconf
+automake -a -c
 %configure
-%{__make}
+%{__make} CXX="%{__cc}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_datadir}/wm-properties
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
+install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/wm-properties/
+
 gzip -9nf README ChangeLog
 
 %clean
@@ -53,10 +66,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README.gz ChangeLog.gz
-%config(noreplace) %verify(not size md5 mtime) %{_datadir}/Blackbox/menu
-%dir %{_datadir}/Blackbox
-%{_mandir}/man1/*
-
+%doc *.gz
+%{_datadir}/wm-properties/blackbox.desktop
 %attr(755,root,root) %{_bindir}/*
-%{_datadir}/Blackbox/styles
+%{_mandir}/man1/*
+%dir %{_sysconfdir}
+%{_sysconfdir}/menu
+%dir %{_datadir}/blackbox
+%{_datadir}/blackbox/styles