rpms/fltk/EL-5 fltk-1.1.8-fluid_desktop.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 fltk.spec, 1.17, 1.18 sources, 1.5, 1.6

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/fltk/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24465

Modified Files:
	.cvsignore fltk.spec sources 
Added Files:
	fltk-1.1.8-fluid_desktop.patch 
Log Message:
* Sat Mar 29 2008 Rex Dieter <rdieter at fedoraproject.org> 1.1.8-1
- fltk-1.1.8 (final)


fltk-1.1.8-fluid_desktop.patch:

--- NEW FILE fltk-1.1.8-fluid_desktop.patch ---
diff -up fltk-1.1.8/fluid/fluid.desktop.dt fltk-1.1.8/fluid/fluid.desktop
--- fltk-1.1.8/fluid/fluid.desktop.dt	2008-03-16 07:07:41.000000000 -0500
+++ fltk-1.1.8/fluid/fluid.desktop	2008-03-29 17:07:49.000000000 -0500
@@ -2,9 +2,9 @@
 Name=FLUID
 Comment=FLTK GUI Designer
 TryExec=fluid
-Exec=cd %D && fluid %F
+Exec=fluid %F
 Icon=fluid
 Terminal=false
 Type=Application
-MimeType=application/x-fluid
+MimeType=application/x-fluid;
 Categories=Development;GUIDesigner;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Jun 2007 14:47:18 -0000	1.5
+++ .cvsignore	30 Mar 2008 00:05:25 -0000	1.6
@@ -1,3 +1 @@
-fltk-1.1.7-source.tar.bz2
-fltk-1.1.x-r5555.tar.bz2
-fltk-1.1.x-r5750.tar.bz2
+fltk-1.1.8-source.tar.bz2


Index: fltk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/EL-5/fltk.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fltk.spec	6 Jun 2007 14:47:18 -0000	1.17
+++ fltk.spec	30 Mar 2008 00:05:25 -0000	1.18
@@ -1,19 +1,20 @@
 
-%define snap    r5750
+#define snap    r6027
 #define _disable_static --disable-static
 
 Summary:	C++ user interface toolkit
 Name:		fltk
 Version:	1.1.8
-Release:	0.3.%{snap}%{?dist}
+Release:	1%{?dist}
 
-License:	LGPL with exceptions
+# see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
+License:	LGPLv2+ with exceptions	
 Group:		System Environment/Libraries
 URL:		http://www.fltk.org/
 %if "%{?snap:1}" == "1"
-Source0:	ftp://ftp3.easysw.com/pub/fltk/snapshots/fltk-1.1.x-%{snap}.tar.bz2
+Source0:        http://ftp.easysw.com/pub/fltk/snapshots/fltk-1.1.x-%{snap}.tar.bz2
 %else
-Source0:        http://ftp3.easysw.com/pub/fltk/%{version}/%{name}-%{version}-source.tar.bz2
+Source0:        http://ftp.easysw.com/pub/fltk/%{version}/%{name}-%{version}-source.tar.bz2
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,6 +25,7 @@
 Patch3: 	fltk-1.1.x-r5750-undefined.patch
 # nuke --rpath (#238284)
 Patch4: 	fltk-1.1.x-r5750-rpath.patch
+Patch5: 	fltk-1.1.8-fluid_desktop.patch
 
 %if 0%{?rhel} > 4 || 0%{?fedora} > 4
 BuildRequires:  libICE-devel libSM-devel
@@ -80,6 +82,7 @@
 %patch2 -p1 -b .test
 %patch3 -p1 -b .undefined
 %patch4 -p1 -b .rpath
+%patch5 -p1 -b .fluid_desktop
 
 
 %build
@@ -91,6 +94,7 @@
 %configure \
   %{?_disable_static} \
   --with-optim="%{optflags}" \
+  --enable-largefile \
   --enable-shared \
   --enable-threads \
   --enable-xdbe \
@@ -113,17 +117,18 @@
 
 make install install-desktop DESTDIR=$RPM_BUILD_ROOT 
 
+# omit examples/games: 
+make -C test uninstall-linux DESTDIR=$RPM_BUILD_ROOT
+rm -f  $RPM_BUILD_ROOT%{_mandir}/man?/{blocks,checkers,sudoku}*
+
 # Makefile hack for 64bitness
 %if "%{_lib}" != "lib"
 rm -f  $RPM_BUILD_ROOT%{_libdir}/../lib
 %endif
 
-desktop-file-install --vendor=%{name} \
+desktop-file-install --vendor="%{name}" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category="Development" \
-  --add-category="GUIDesigner" \
-  --delete-original \
-    $RPM_BUILD_ROOT%{_datadir}/applnk/Development/*.desktop
+    $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop
 
 # docs
 rm -rf __docs
@@ -136,9 +141,6 @@
 %if "%{?_disable_static:1}" == "1"
 rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.a
 %endif
-# omit examples/games: 
-make -C test uninstall-linux DESTDIR=$RPM_BUILD_ROOT
-rm -f  $RPM_BUILD_ROOT%{_mandir}/man?/{blocks,checkers,sudoku}*
 
 
 %check
@@ -202,6 +204,25 @@
 
 
 %changelog
+* Sat Mar 29 2008 Rex Dieter <rdieter at fedoraproject.org> 1.1.8-1
+- fltk-1.1.8 (final)
+
+* Tue Feb 29 2008 Rex Dieter <rdieter at fedoraproject.org> 1.1.8-0.8.r6027
+- fltk-1.1.x-r6027
+
+* Mon Feb 11 2008 Rex Dieter <rdieter at fedoraproject.org> 1.1.8-0.7.r5989 
+- respin (gcc43)
+
+* Wed Dec 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.8-0.6.r5989
+- --enable-largefile
+- fltk-1.1.x-r5989 snapshot (1.1.8 pre-release)
+
+* Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.8-0.5.r5750
+- License: LGPLv2+ with exceptions
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.8-0.4.r5750
+- License: LGPLv2+ (with exceptions)
+
 * Sun Apr 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.8-0.3.r5750
 - *really* fix --rpath issue, using non-empty patch this time (#238284)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Jun 2007 14:47:18 -0000	1.5
+++ sources	30 Mar 2008 00:05:25 -0000	1.6
@@ -1 +1 @@
-aa00ebba4fdec4ebab2881537b7d626f  fltk-1.1.x-r5750.tar.bz2
+0f272d7299778e42fcbedf3c01741f4f  fltk-1.1.8-source.tar.bz2