rpms/merkaartor/devel merkaartor-log-to-dev-null.patch, NONE, 1.1 merkaartor.spec, 1.15, 1.16

Sven Lankes slankes at fedoraproject.org
Thu Dec 10 22:21:37 UTC 2009


Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2173/devel

Modified Files:
	merkaartor.spec 
Added Files:
	merkaartor-log-to-dev-null.patch 
Log Message:
Add patch to write log to /dev/null by default (bz# 544284)


merkaartor-log-to-dev-null.patch:
 Main.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE merkaartor-log-to-dev-null.patch ---
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -95,7 +95,7 @@ int main(int argc, char** argv)
 	QApplication app(argc,argv);
 
 #if defined(Q_OS_UNIX)
-	QString logFilename("/tmp/merkaartor.log");
+	QString logFilename("/dev/null");
 #else
 	QString logFilename(qApp->applicationDirPath() + "/merkaartor.log");
 #endif


Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/merkaartor.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- merkaartor.spec	12 Aug 2009 14:52:29 -0000	1.15
+++ merkaartor.spec	10 Dec 2009 22:21:37 -0000	1.16
@@ -1,12 +1,13 @@
 Name:           merkaartor
 Version:        0.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
 License:        GPLv2
 URL:            http://www.merkaartor.org
 Source0:        http://www.merkaartor.org/downloads/source/%{name}-%{version}.tar.bz2
+Patch0:         merkaartor-log-to-dev-null.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel >= 4.4
@@ -23,6 +24,7 @@ transparent display of map features like
 
 %prep
 %setup -q -n merkaartor-0.14 
+%patch0 -p1
 find \( -name "*.cpp" -o -name "*.h" \) -exec chmod -x {} \;
 
 %build
@@ -58,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
+* Thu Dec 10 2009 Sven Lankes <sven at lank.es> - 0.14-2
+- Write log to /dev/null unless specified (bz# 544284)
+
 * Wed Aug 12 2009 Sven Lankes <sven at lank.es> - 0.14-1
 - 0.14
 - Remove patch for gdal/qtgtkstyle-related crash - seems to be fixed in gdal




More information about the fedora-extras-commits mailing list