- added am_fixes patch (install menu file in sysconfdir).

Changed files:
    blackbox.spec -> 1.43

diff --git a/blackbox.spec b/blackbox.spec
index 53659f2bdda1b6ab7d7b22a387097eacc484fda4..1ebe7dd5ee18319d95245b9fab8a48e1ccea7451 100644 (file)
--- a/blackbox.spec
+++ b/blackbox.spec
@@ -12,6 +12,7 @@ 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: autoconf
@@ -19,8 +20,8 @@ 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
@@ -41,6 +42,7 @@ gradientowe lub tr
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 aclocal
@@ -55,7 +57,7 @@ install -d $RPM_BUILD_ROOT%{_datadir}/wm-properties
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/wm-properties
+install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/wm-properties/
 
 gzip -9nf README ChangeLog
 
@@ -65,9 +67,10 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc *.gz
-%config(noreplace) %verify(not size md5 mtime) %{_datadir}/blackbox/menu
 %{_datadir}/wm-properties/blackbox.desktop
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man1/*
+%dir %{_sysconfdir}
+%{_sysconfdir}/menu
 %dir %{_datadir}/blackbox
 %{_datadir}/blackbox/styles