[svn] r5290 - in trunk/rpms: fltk httptunnel openexr xosview xrestop

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Wed Apr 18 00:30:51 CEST 2007 

Author: dag
Date: 2007-04-18 00:30:50 +0200 (Wed, 18 Apr 2007)
New Revision: 5290

Modified:
   trunk/rpms/fltk/fltk.spec
   trunk/rpms/httptunnel/httptunnel.spec
   trunk/rpms/openexr/openexr.spec
   trunk/rpms/xosview/xosview.spec
   trunk/rpms/xrestop/xrestop.spec
Log:
Updates

Modified: trunk/rpms/fltk/fltk.spec
===================================================================
--- trunk/rpms/fltk/fltk.spec	2007-04-17 22:23:53 UTC (rev 5289)
+++ trunk/rpms/fltk/fltk.spec	2007-04-17 22:30:50 UTC (rev 5290)
@@ -6,23 +6,35 @@
 
 %{?dist: %{expand: %%define %dist 1}}
 
+%{?fc4:%define _without_modxorg 1}
 %{?el4:%define _without_modxorg 1}
-%{?el3:%define _without_modxorg 1}
-%{?el2:%define _without_modxorg 1}
-%{?fc4:%define _without_modxorg 1}
 %{?fc3:%define _without_modxorg 1}
 %{?fc2:%define _without_modxorg 1}
 %{?fc1:%define _without_modxorg 1}
+%{?el3:%define _without_modxorg 1}
+%{?rh9:%define _without_modxorg 1}
+%{?rh7:%define _without_modxorg 1}
+%{?el2:%define _without_modxorg 1}
+%{?rh6:%define _without_modxorg 1}
 
+%define desktop_vendor rpmforge
+
+### Fix problem with Makefiles in 64bit build
+%if "%{_lib}" == "lib64"
+%define sixtyfourbit 1
+%endif
+
 Summary: Cross-platform C++ GUI toolkit
 Name: fltk
 Version: 1.1.7
-Release: 1.2
+Release: 2
 License: FLTK
 Group: System Environment/Libraries
 URL: http://www.fltk.org/
 
 Source: http://ftp.easysw.com/pub/fltk/1.1.7/fltk-%{version}-source.tar.bz2
+Patch1: fltk-1.1.7-config.patch
+Patch2: fltk-1.1.7-test.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: gcc, gcc-c++, zlib-devel
@@ -46,49 +58,109 @@
 documentation for %{name}. If you like to develop programs using %{name},
 you will need to install %{name}-devel.
 
+%package fluid
+Summary: Fast Light User Interface Designer
+Group: Development/Tools
+Requires: %{name}-devel = %{version}-%{release}
+
+%description fluid
+Fast Light User Interface Designer, an interactive GUI designer for fltk.
+
 %prep
 %setup
+%patch1 -p1 -b .199656
+%patch2 -p1 -b .test
 
 ### FIXME: Make Makefile use autotool directory standard. (Please fix upstream)
 %{__perl} -pi.orig -e '
 		s|\$\(mandir\)/cat1|\$(mandir)/man1|g;
 		s|\$\(mandir\)/cat3|\$(mandir)/man3|g;
+		s|\$\(mandir\)/cat6|\$(mandir)/man6|g;
 	' documentation/Makefile
 
+#%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' configure makeinclude.in Makefile.in */Makefile.in */*/Makefile.in
+
 %build
 %configure \
-	--enable-shared="yes" --enable-threads
+	--enable-shared="yes" \
+	--enable-threads \
+	--enable-xdbe \
+	--enable-xft
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
+%{__install} -d -m0755 %{buildroot}%{_libdir}
 
-### FIXME: Makefile doesn't create target directories (Please fix upstream)
-%{__install} -d -m0755 %{buildroot}%{_bindir} \
-			%{buildroot}%{_includedir}/FL/
+%{?sixtyfourbit:%{__ln_s} -f %{_lib} %{buildroot}%{_prefix}/lib}
+%{__make} install install-desktop DESTDIR="%{buildroot}"
+%{?sixtyfourbit:%{__rm} -f %{buildroot}%{_prefix}/lib}
 
-%makeinstall
+%{__mv} -f %{buildroot}%{_docdir} rpm-doc/
 
-%{__mv} -f %{buildroot}%{_docdir} rpm-doc
+### Clean up buildroot
+%{__rm} -f %{buildroot}%{_datadir}/applnk/Games/{checkers,sudoku}.desktop
+%{__rm} -f %{buildroot}%{_mandir}/man6/{checkers,sudoku}.?
 
+desktop-file-install --delete-original \
+	--vendor %{desktop_vendor} \
+	--add-category Development \
+	--add-category X-Red-Hat-Base \
+	--dir %{buildroot}%{_datadir}/applications \
+	%{buildroot}%{_datadir}/applnk/Development/*.desktop
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%post fluid
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null ||:
+update-desktop-database &>/dev/null ||:
+
+%postun fluid
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null ||:
+update-desktop-database &>/dev/null ||:
+
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, 0755)
 %doc ANNOUNCEMENT CHANGES COPYING CREDITS README rpm-doc/*
-%doc %{_mandir}/man1/*
-%{_bindir}/*
-%{_libdir}/*.so.*
+%{_libdir}/libfltk.so.*
+%{_libdir}/libfltk_forms.so.*
+%{_libdir}/libfltk_gl.so.*
+%{_libdir}/libfltk_images.so.*
 
 %files devel
 %defattr(-, root, root, 0755)
-%doc %{_mandir}/man3/*
-%{_includedir}/F*
-%{_libdir}/*.a
-%{_libdir}/*.so
+%doc %{_mandir}/man1/fltk-config.1*
+%doc %{_mandir}/man3/fltk.3*
+%{_bindir}/fltk-config
+%{_includedir}/Fl
+%{_includedir}/FL/
+%exclude %{_libdir}/libfltk.a
+%exclude %{_libdir}/libfltk_forms.a
+%exclude %{_libdir}/libfltk_gl.a
+%exclude %{_libdir}/libfltk_images.a
+%{_libdir}/libfltk.so
+%{_libdir}/libfltk_forms.so
+%{_libdir}/libfltk_gl.so
+%{_libdir}/libfltk_images.so
 
+%files fluid
+%defattr(-, root, root, 0755)
+%doc %{_mandir}/man1/fluid.1*
+%{_bindir}/fluid
+%{_datadir}/applications/*fluid.desktop
+%{_datadir}/mimelnk/*/*.desktop
+%{_datadir}/icons/hicolor/*/*/*
+
 %changelog
+* Sun Apr 01 2007 Dag Wieers <dag at wieers.com> - 1.1.7-2
+- Added Fedora patches.
+
 * Mon May 08 2006 Dries Verachtert <dries at ulyssis.org> - 1.1.7-2
 - Added --enable-threads, thanks to Pekka Vuorela.
 

Modified: trunk/rpms/httptunnel/httptunnel.spec
===================================================================
--- trunk/rpms/httptunnel/httptunnel.spec	2007-04-17 22:23:53 UTC (rev 5289)
+++ trunk/rpms/httptunnel/httptunnel.spec	2007-04-17 22:30:50 UTC (rev 5290)
@@ -41,8 +41,5 @@
 %{_bindir}/*
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 3.0.5-1.2
-- Rebuild for Fedora Core 5.
-
 * Sun Mar 28 2004 Dag Wieers <dag at wieers.com> - 3.0.5-1
 - Initial package. (using DAR)

Modified: trunk/rpms/openexr/openexr.spec
===================================================================
--- trunk/rpms/openexr/openexr.spec	2007-04-17 22:23:53 UTC (rev 5289)
+++ trunk/rpms/openexr/openexr.spec	2007-04-17 22:30:50 UTC (rev 5290)
@@ -4,13 +4,16 @@
 
 %{?dist: %{expand: %%define %dist 1}}
 
+%{?fc4:%define _without_modxorg 1}
 %{?el4:%define _without_modxorg 1}
-%{?el3:%define _without_modxorg 1}
-%{?el2:%define _without_modxorg 1}
-%{?fc4:%define _without_modxorg 1}
 %{?fc3:%define _without_modxorg 1}
 %{?fc2:%define _without_modxorg 1}
 %{?fc1:%define _without_modxorg 1}
+%{?el3:%define _without_modxorg 1}
+%{?rh9:%define _without_modxorg 1}
+%{?rh7:%define _without_modxorg 1}
+%{?el2:%define _without_modxorg 1}
+%{?rh6:%define _without_modxorg 1}
 
 Summary: High dynamic range image file format
 Name: openexr

Modified: trunk/rpms/xosview/xosview.spec
===================================================================
--- trunk/rpms/xosview/xosview.spec	2007-04-17 22:23:53 UTC (rev 5289)
+++ trunk/rpms/xosview/xosview.spec	2007-04-17 22:30:50 UTC (rev 5290)
@@ -3,18 +3,18 @@
 
 %{?dist: %{expand: %%define %dist 1}}
 
-%{?rh7:%define _without_freedesktop 1}
-%{?el2:%define _without_freedesktop 1}
-%{?rh6:%define _without_freedesktop 1}
-
+%{?fc4:%define _without_modxorg 1}
 %{?el4:%define _without_modxorg 1}
-%{?el3:%define _without_modxorg 1}
-%{?el2:%define _without_modxorg 1}
-%{?fc4:%define _without_modxorg 1}
 %{?fc3:%define _without_modxorg 1}
 %{?fc2:%define _without_modxorg 1}
 %{?fc1:%define _without_modxorg 1}
+%{?el3:%define _without_modxorg 1}
+%{?el2:%define _without_modxorg 1}
 
+%{?rh7:%define _without_freedesktop 1}
+%{?el2:%define _without_freedesktop 1}
+%{?rh6:%define _without_freedesktop 1}
+
 %define desktop_vendor rpmforge
 
 Summary: X Window System utility for monitoring system resources

Modified: trunk/rpms/xrestop/xrestop.spec
===================================================================
--- trunk/rpms/xrestop/xrestop.spec	2007-04-17 22:23:53 UTC (rev 5289)
+++ trunk/rpms/xrestop/xrestop.spec	2007-04-17 22:30:50 UTC (rev 5290)
@@ -26,7 +26,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: ncurses-devel
-%{!?_without_modxorg:BuildRequires: libX11-devel}
+%{!?_without_modxorg:BuildRequires: libXres-devel}
 %{?_without_modxorg:BuildRequires: XFree86-devel}
 
 %description

More information about the svn-commits mailing list