From 805d45526a1184e050cefdc07a11c67215a9a6e8870bfe29b2d8deeb688eca92 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 6 Dec 2007 00:02:58 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kst?expand=0&rev=7 --- kst.changes | 5 +++++ kst.spec | 10 +++++++--- r703517.diff | 19 +++++++++++++++++++ 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 r703517.diff diff --git a/kst.changes b/kst.changes index 9d06ea8..e119f5d 100644 --- a/kst.changes +++ b/kst.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 28 14:44:48 CET 2007 - dmueller@suse.de + +- fix build against glibc 2.7 + ------------------------------------------------------------------- Sat Aug 4 14:27:40 CEST 2007 - stbinner@suse.de diff --git a/kst.spec b/kst.spec index a1c9a62..68c479f 100644 --- a/kst.spec +++ b/kst.spec @@ -22,11 +22,12 @@ License: GPL v2 or later Group: Productivity/Graphics/Visualization/Graph Summary: Real-Time Data Viewing and Plotting Tool with Basic Data Analysis Functionality Version: 1.4.0 -Release: 1 -URL: http://extragear.kde.org/apps/kst/ +Release: 52 +Url: http://extragear.kde.org/apps/kst/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%version.tar.bz2 Patch: FIXME.diff +Patch1: r703517.diff Requires: %{name}-lang = %{version} %description @@ -63,6 +64,7 @@ Authors: %if %suse_version > 1020 %lang_package %endif + %package devel Summary: Real-Time Data Viewing and Plotting Tool with Basic Data Analysis Functionality Group: Productivity/Scientific/Math @@ -102,6 +104,7 @@ Authors: %prep %setup -q %patch +%patch1 . /etc/opt/kde3/common_options update_admin --no-unsermake @@ -115,7 +118,6 @@ make %{?jobs:-j %jobs} make DESTDIR=${RPM_BUILD_ROOT} install %suse_update_desktop_file %name Science Math %if %suse_version > 1020 - %fdupes $RPM_BUILD_ROOT %endif %find_lang %name @@ -161,6 +163,8 @@ rm -rf ${RPM_BUILD_ROOT} /opt/kde3/share/config/colors %changelog +* Wed Nov 28 2007 - dmueller@suse.de +- fix build against glibc 2.7 * Sat Aug 04 2007 - stbinner@suse.de - update to version 1.4: numerous bugfixes, see ChangeLog * Thu Jun 21 2007 - stbinner@suse.de diff --git a/r703517.diff b/r703517.diff new file mode 100644 index 0000000..45b6ec3 --- /dev/null +++ b/r703517.diff @@ -0,0 +1,19 @@ +------------------------------------------------------------------------ +r703517 | wiebe | 2007-08-22 20:33:03 +0200 (Wed, 22 Aug 2007) | 4 lines + +Apply Matt's patch to supply the third argument to open to allow compilation +with gcc -D_FORTIFY_SOURCE=2 + + +------------------------------------------------------------------------ +--- kst/src/datasources/dirfile/getdata.c ++++ kst/src/datasources/dirfile/getdata.c +@@ -2252,7 +2252,7 @@ static int DoIfRawOut(struct FormatType + return(1); + } + }else{ +- R->fp = open(datafilename, O_RDWR | O_CREAT); ++ R->fp = open(datafilename, O_RDWR | O_CREAT, 0644); + if (R->fp < 0) { + *n_write = 0; + *error_code = PD_E_OPEN_RAWFIELD;