- cleanup

Changed files:
    fltk-1.1.9-glibc2.10-scandir.patch -> 1.2
    fltk.spec -> 1.77

diff --git a/fltk-1.1.9-glibc2.10-scandir.patch b/fltk-1.1.9-glibc2.10-scandir.patch
deleted file mode 100644 (file)
index 0051306..0000000
--- a/fltk-1.1.9-glibc2.10-scandir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up fltk-1.1.9/src/filename_list.cxx.gcc44 fltk-1.1.9/src/filename_list.cxx
---- fltk-1.1.9/src/filename_list.cxx.gcc44     2006-06-09 11:16:34.000000000 -0500
-+++ fltk-1.1.9/src/filename_list.cxx   2009-05-13 09:46:42.372917879 -0500
-@@ -67,7 +67,7 @@ int fl_filename_list(const char *d, dire
-   // The vast majority of UNIX systems want the sort function to have this
-   // prototype, most likely so that it can be passed to qsort without any
-   // changes:
--  int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort);
-+  int n = scandir(d, list, 0, (int(*)(const dirent **,const dirent **))sort);
- #else
-   // This version is when we define our own scandir (WIN32 and perhaps
-   // some Unix systems) and apparently on IRIX:

diff --git a/fltk.spec b/fltk.spec
index 49525cb1b470ba75d9928331228ed4b550ad1b39..c5c1e6ae08d711a59314870d7d136839709fc91f 100644 (file)
--- a/fltk.spec
+++ b/fltk.spec
@@ -17,8 +17,7 @@ Source1:      http://ftp.easysw.com/pub/fltk/%{version}/%{name}-%{version}-docs-html.
 # Source1-md5: ee79155cffc211e1d70a3ad8d3f170ef
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-1.3.0-as-needed.patch
-#Patch2:               %{name}-1.1.9-glibc2.10-scandir.patch
-Patch3:                %{name}-link.patch
+Patch2:                %{name}-link.patch
 URL:           http://www.fltk.org/
 %{?with_opengl:BuildRequires:  OpenGL-GLU-devel}
 BuildRequires: autoconf
@@ -152,10 +151,7 @@ Gry FLTK: Atak Klocków!, Warcaby, Sudoku.
 %setup -q -a1
 %patch0 -p1
 %patch1 -p1
-#%patch2 -p1
-%patch3 -p1
-
-#install %{SOURCE1} .
+%patch2 -p1
 
 %build
 %{__autoconf}