rpms/fltk/EL-4 fltk-1.1.7-config.patch, NONE, 1.1 fltk.spec, 1.8, 1.9 fluid.desktop, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/fltk/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20287

Modified Files:
	fltk.spec 
Added Files:
	fltk-1.1.7-config.patch 
Removed Files:
	fluid.desktop 
Log Message:
* Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.7-5
- use included icon/.desktop files
- fix up fltk-config (#199656)


fltk-1.1.7-config.patch:

--- NEW FILE fltk-1.1.7-config.patch ---
--- fltk-1.1.7/fltk-config.in.config	2005-12-07 14:13:12.000000000 -0600
+++ fltk-1.1.7/fltk-config.in	2006-12-11 23:33:40.000000000 -0600
@@ -52,12 +52,6 @@
 # post-process command (only needed for MacOS)
 POSTBUILD="@POSTBUILD@"
 
-# flags for C++ compiler:
-CFLAGS="@CFLAGS@"
-CXXFLAGS="@CXXFLAGS@"
-LDFLAGS="@LDFLAGS@"
-LDLIBS="@LIBS@"
-
 # Check for local invocation, and update paths accordingly...
 if test -f "$selfdir/FL/Fl_Window.H"; then
 	bindir="$selfdir/fluid"


Index: fltk.spec
===================================================================
RCS file: /cvs/extras/rpms/fltk/EL-4/fltk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fltk.spec	11 Dec 2006 22:49:01 -0000	1.8
+++ fltk.spec	12 Dec 2006 06:11:39 -0000	1.9
@@ -1,7 +1,8 @@
+
 Summary:	C++ user interface toolkit
 Name:		fltk
 Version:	1.1.7
-Release:	2%{?dist}
+Release:	5%{?dist}
 
 License:	LGPL with exceptions
 Group:		System Environment/Libraries
@@ -9,7 +10,8 @@
 Source0:        http://ftp.easysw.com/pub/fltk/%{version}/%{name}-%{version}-source.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source1:        fluid.desktop
+# See http://bugzilla.redhat.com/199656
+Patch1:         fltk-1.1.7-config.patch
 
 %if 0%{?rhel} > 4 || 0%{?fedora} > 4
 BuildRequires:  libICE-devel libSM-devel
@@ -22,10 +24,8 @@
 BuildRequires:  zlib-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libGL-devel libGLU-devel 
-BuildRequires:	pkgconfig
-BuildRequires:	ImageMagick
+BuildRequires:  pkgconfig
 BuildRequires:  desktop-file-utils
-BuildRequires:  man
 
 %package devel
 Summary:	Development package for %{name}
@@ -68,32 +68,46 @@
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
 
+%patch1 -p1 -b .199656
+
 
 %build
-perl -pi -e "s^\\\$prefix/share/doc/fltk^$RPM_DOC_DIR/%{name}-devel-%{version}^" configure
 export CPPFLAGS="$(pkg-config xft --cflags)"
 export LDFLAGS="$(pkg-config xft --libs)"
 
-%configure --enable-shared --enable-threads --enable-xdbe --enable-xft
+%configure \
+  --disable-static \
+  --enable-shared \
+  --enable-threads \
+  --enable-xdbe \
+  --enable-xft
 
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT __documentation
-%makeinstall docdir=$(pwd)/__documentation
-rm -rf $RPM_BUILD_ROOT%{_mandir}/cat*
-
-desktop-file-install --vendor=fedora            \
-    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-    %{SOURCE1} 
+rm -rf $RPM_BUILD_ROOT 
+make install install-desktop DESTDIR=$RPM_BUILD_ROOT 
 
-convert -resize 48x48 documentation/FL.gif fluid.png 
-install -p -m644 -D fluid.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/fluid.png
+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
+
+# docs
+rm -rf __docs
+mv $RPM_BUILD_ROOT%{_docdir}/fltk __docs
 
 ## unpackaged files
+# errant docs
+rm -rf $RPM_BUILD_ROOT%{_mandir}/cat*
 # static libs
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a
+rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.a
+# games: checkers/sudoku
+make -C test uninstall-linux DESTDIR=$RPM_BUILD_ROOT
+rm -f  $RPM_BUILD_ROOT%{_mandir}/man?/{sudoku,checkers}*
 
 
 %clean
@@ -106,9 +120,13 @@
 
 %post fluid
 touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 
 %postun fluid
 touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 
 
 %files
@@ -121,9 +139,9 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc __documentation/*
+%doc __docs/*
 %{_bindir}/fltk-config
-%{_includedir}/FL
+%{_includedir}/FL/
 %{_includedir}/Fl
 %{_libdir}/libfltk.so
 %{_libdir}/libfltk_forms.so
@@ -137,15 +155,23 @@
 %{_bindir}/fluid
 %{_mandir}/man1/fluid.1*
 %{_datadir}/applications/*fluid.desktop
+# FIXME
+%{_datadir}/mimelnk/*/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
 
 
 %changelog
-* Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.7-2
-- EPEL branch
+* Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.7-5
+- use included icon/.desktop files
+- fix up fltk-config (#199656)
+
+* Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.7-3
 - follow icon spec
 - omit static libs
 
+* Wed Sep 06 2006 Michael J. Knox <michael[AT]knox.net.nz> - 1.1.7-2
+- rebuild for FC6
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.1.7-1
 - Upstream update
 


--- fluid.desktop DELETED ---