rpms/fltk/devel fltk-1.1.9-scandir.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 fltk-1.1.9-rpath.patch, 1.1, 1.2 fltk.spec, 1.44, 1.45 sources, 1.10, 1.11 fltk-1.1.9-consts.patch, 1.1, NONE fltk-1.1.9-gcc44.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Wed Dec 9 00:32:59 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/fltk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30821
Modified Files:
.cvsignore fltk-1.1.9-rpath.patch fltk.spec sources
Added Files:
fltk-1.1.9-scandir.patch
Removed Files:
fltk-1.1.9-consts.patch fltk-1.1.9-gcc44.patch
Log Message:
* Tue Dec 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.10-0.1.rc3
- fltk-1.1.10rc3
fltk-1.1.9-scandir.patch:
filename_list.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE fltk-1.1.9-scandir.patch ---
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:
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore 1 Oct 2008 17:22:37 -0000 1.10
+++ .cvsignore 9 Dec 2009 00:32:59 -0000 1.11
@@ -1 +1 @@
-fltk-1.1.9-source.tar.bz2
+fltk-1.1.10rc3-source.tar.bz2
fltk-1.1.9-rpath.patch:
configure | 4 ++--
configure.in | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
Index: fltk-1.1.9-rpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/devel/fltk-1.1.9-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fltk-1.1.9-rpath.patch 13 May 2009 15:37:43 -0000 1.1
+++ fltk-1.1.9-rpath.patch 9 Dec 2009 00:32:59 -0000 1.2
@@ -8,9 +8,9 @@ diff -up fltk-1.1.9/configure.in.rpath f
- if test "x$libdir" != "x/usr/lib"; then
- DSOLINK="-Wl,-rpath,$libdir"
- fi
-+# if test "x$libdir" != "x/usr/lib"; then
-+# DSOLINK="-Wl,-rpath,$libdir"
-+# fi
++ if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib32" -a "x$libdir" != "x/usr/lib64"; then
++ DSOLINK="-Wl,-rpath,$libdir"
++ fi
;;
AIX*)
DSONAME="libfltk_s.a"
Index: fltk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/devel/fltk.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- fltk.spec 9 Dec 2009 00:04:11 -0000 1.44
+++ fltk.spec 9 Dec 2009 00:32:59 -0000 1.45
@@ -1,10 +1,12 @@
%global arch %(arch 2>/dev/null || echo undefined)
+%define pre rc3
+
Summary: C++ user interface toolkit
Name: fltk
-Version: 1.1.9
-Release: 7%{?dist}
+Version: 1.1.10
+Release: 0.1.%{pre}%{?dist}
# see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
License: LGPLv2+ with exceptions
@@ -13,7 +15,8 @@ URL: http://www.fltk.org/
%if "%{?snap:1}" == "1"
Source0: http://ftp.easysw.com/pub/fltk/snapshots/fltk-1.1.x-%{snap}.tar.bz2
%else
-Source0: http://ftp.easysw.com/pub/fltk/%{version}/%{name}-%{version}-source.tar.bz2
+Source0: http://ftp.easysw.com/pub/fltk/%{version}%{?pre}/%{name}-%{version}%{?pre}-source.tar.bz2
+#Source0: http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/1.1.10rc3/fltk-1.1.10rc3-source.tar.bz2
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,8 +30,7 @@ Patch3: fltk-1.1.x-r5750-undefined.patc
# nuke --rpath (#238284)
Patch4: fltk-1.1.9-rpath.patch
Patch5: fltk-1.1.8-fluid_desktop.patch
-Patch6: fltk-1.1.9-consts.patch
-Patch7: fltk-1.1.9-gcc44.patch
+Patch7: fltk-1.1.9-scandir.patch
%if 0%{?rhel} > 4 || 0%{?fedora} > 4
BuildRequires: libICE-devel libSM-devel
@@ -85,7 +87,7 @@ Requires: %{name}-devel = %{version}-%{r
%if "%{?snap:1}" == "1"
%setup -q -n fltk-1.1.x-%{snap}
%else
-%setup -q
+%setup -q -n fltk-%{version}%{?pre}
%endif
%patch1 -p1 -b .fltk_config
@@ -93,7 +95,6 @@ Requires: %{name}-devel = %{version}-%{r
%patch3 -p1 -b .undefined
%patch4 -p1 -b .rpath
%patch5 -p1 -b .fluid_desktop
-%patch6 -p1 -b .consts
# FIXME, why only needed for F-11+/gcc44 ?
%if 0%{?fedora} > 10
%patch7 -p1 -b .gcc44
@@ -156,7 +157,7 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}/cat*
%check
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop
-make test
+make -C test
%clean
@@ -224,6 +225,9 @@ gtk-update-icon-cache %{_datadir}/icons/
%changelog
+* Tue Dec 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.10-0.1.rc3
+- fltk-1.1.10rc3
+
* Mon Dec 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.9-7
- real -static subpkg (#545145)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources 1 Oct 2008 17:22:37 -0000 1.10
+++ sources 9 Dec 2009 00:32:59 -0000 1.11
@@ -1 +1 @@
-e146fd264e1001b1313acfd41ef75552 fltk-1.1.9-source.tar.bz2
+9e90a57291e2edb1a82d1083a765c8e4 fltk-1.1.10rc3-source.tar.bz2
--- fltk-1.1.9-consts.patch DELETED ---
--- fltk-1.1.9-gcc44.patch DELETED ---
More information about the fedora-extras-commits
mailing list