rpms/metamonitor/devel metamonitor-0.4.5-gcc43.patch, NONE, 1.1 metamonitor.spec, 1.4, 1.5

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/metamonitor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26934

Modified Files:
	metamonitor.spec 
Added Files:
	metamonitor-0.4.5-gcc43.patch 
Log Message:
* Wed Apr 02 2008 Rex Dieter <rdieter at fedoraproject.org> 0.4.5-5
- fix rawhide build (#434080)
- License: GPLv2+


metamonitor-0.4.5-gcc43.patch:

--- NEW FILE metamonitor-0.4.5-gcc43.patch ---
diff -up metamonitor-0.4.5/src/mfile.h.gcc43 metamonitor-0.4.5/src/mfile.h
--- metamonitor-0.4.5/src/mfile.h.gcc43	2008-04-02 09:16:52.000000000 -0500
+++ metamonitor-0.4.5/src/mfile.h	2008-04-02 09:16:56.000000000 -0500
@@ -12,6 +12,7 @@
 #ifndef MFILE_H
 #define MFILE_H
 
+#include <sys/dir.h>
 #include <qobject.h>
 #include <qstring.h>
 


Index: metamonitor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metamonitor/devel/metamonitor.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- metamonitor.spec	27 Mar 2008 12:53:56 -0000	1.4
+++ metamonitor.spec	2 Apr 2008 14:20:57 -0000	1.5
@@ -1,13 +1,14 @@
 Name:           metamonitor
 Version:        0.4.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A Simple program that watches log files and popup its changes
 
 Group:          Applications/System
-License:        GPL
+License:        GPLv2+
 URL:            http://metamonitor.sourceforge.net/
 Source0:	http://easynews.dl.sourceforge.net/sourceforge/metamonitor/%{name}-%{version}.tar.bz2
 Patch0:         metamonitor-symlink-relative.patch
+Patch1:         metamonitor-0.4.5-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs3-devel, desktop-file-utils, gettext, libxml2
@@ -22,11 +23,11 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1 -b .gcc43
 
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 %configure --disable-rpath --disable-debug
 make %{?_smp_mflags}
 
@@ -37,7 +38,6 @@
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
         --add-category Application                              \
         --add-category Utility                                  \
         --add-category KDE                                      \
@@ -74,6 +74,10 @@
 %{_datadir}/icons/hicolor/*/apps/metamonitor.png
 
 %changelog
+* Wed Apr 02 2008 Rex Dieter <rdieter at fedoraproject.org> 0.4.5-5
+- fix rawhide build (#434080)
+- License: GPLv2+
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.5-4
 - Autorebuild for GCC 4.3