rpms/fltk/EL-4 fluid.desktop, NONE, 1.1 .cvsignore, 1.2, 1.3 fltk.spec, 1.7, 1.8 sources, 1.2, 1.3

Mon Dec 11 22:49:31 UTC 2006

Author: rdieter

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

Modified Files:
	.cvsignore fltk.spec sources 
Added Files:
	fluid.desktop 
Log Message:
* Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.7-2
- EPEL branch
- follow icon spec
- omit static libs

--- NEW FILE fluid.desktop ---
[Desktop Entry]
Name=Fluid
Comment=Fast Light User Interface Designer
Exec=fluid
Icon=fluid
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Development;GUIDesigner;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fltk/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:18:58 -0000	1.2
+++ .cvsignore	11 Dec 2006 22:49:01 -0000	1.3
@@ -1 +1 @@
-fltk-1.1.4-source.tar.bz2
+fltk-1.1.7-source.tar.bz2


Index: fltk.spec
===================================================================
RCS file: /cvs/extras/rpms/fltk/EL-4/fltk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fltk.spec	18 Aug 2005 06:53:27 -0000	1.7
+++ fltk.spec	11 Dec 2006 22:49:01 -0000	1.8
@@ -1,29 +1,49 @@
-Summary: 	A C++ user interface toolkit for X11, Win32, and MacOS X
-Name: 		fltk
-Version: 	1.1.4
-Release: 	9%{?dist}
-Epoch: 		0
-License: 	LGPL with exceptions
-Group: 		System Environment/Libraries
-URL: 		http://www.fltk.org/
-Source0: 	%{name}-%{version}%{?extraversion}-source.tar.bz2
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	libjpeg-devel zlib-devel libpng-devel XFree86-devel
-BuildRequires:	%{_libdir}/pkgconfig/xft.pc pkgconfig
-BuildRequires:	ImageMagick desktop-file-utils man
+Summary:	C++ user interface toolkit
+Name:		fltk
+Version:	1.1.7
+Release:	2%{?dist}
+
+License:	LGPL with exceptions
+Group:		System Environment/Libraries
+URL:		http://www.fltk.org/
+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
+
+%if 0%{?rhel} > 4 || 0%{?fedora} > 4
+BuildRequires:  libICE-devel libSM-devel
+BuildRequires:	libXext-devel libXft-devel libXt-devel libX11-devel
+BuildRequires:  xorg-x11-proto-devel 
+%else
+BuildRequires:  xorg-x11-devel
+%endif
+BuildRequires:  libjpeg-devel
+BuildRequires:  zlib-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libGL-devel libGLU-devel 
+BuildRequires:	pkgconfig
+BuildRequires:	ImageMagick
+BuildRequires:  desktop-file-utils
+BuildRequires:  man
 
 %package devel
-Summary: 	Development package for %{name}
-Group: 		Development/Libraries
-Requires: 	%{name} = %{epoch}:%{version}-%{release}
-Requires:	XFree86-devel libstdc++-devel %{_libdir}/pkgconfig/xft.pc
+Summary:	Development package for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	libstdc++-devel
+Requires:       libGL-devel libGLU-devel
+%if 0%{?rhel} > 4 || 0%{?fedora} > 4
+Requires:       libXft-devel libXext-devel
+Requires:       libX11-devel libSM-devel libICE-devel
+%else
+Requires:       xorg-x11-devel
+%endif
 
 %package fluid
-Summary: 	Fast Light User Interface Designer
-Group: 		Development/Tools
-Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
-
-# -----------------------------------------------------------------------------
+Summary:	Fast Light User Interface Designer
+Group:		Development/Tools
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description
 FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit for
@@ -31,7 +51,7 @@
 GUI functionality without the bloat, and supports 3D graphics via
 OpenGL and its built-in GLUT emulation. FLTK is designed to be small
 and modular enough to be statically linked, and also works fine as a
-shared library. 
+shared library.
 
 %description devel
 This package contains development files for %{name}
@@ -42,61 +62,55 @@
 
 %description fluid
 fluid stands for the Fast Light User Interface Designer. It is an
-interactive GUI designer for FLTK. 
+interactive GUI designer for FLTK.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
 
-# -----------------------------------------------------------------------------
 
 %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
-make %{?_smp_mflags} 
 
-# -----------------------------------------------------------------------------
+make %{?_smp_mflags}
+
 
 %install
 rm -rf $RPM_BUILD_ROOT __documentation
 %makeinstall docdir=$(pwd)/__documentation
 rm -rf $RPM_BUILD_ROOT%{_mandir}/cat*
 
-cat > fluid.desktop <<EOF
-[Desktop Entry]
-Name=Fluid
-Comment=Fast Light User Interface Designer
-Exec=fluid
-Icon=fluid.png
-Terminal=false
-Type=Application
-Encoding=UTF-8
-Categories=Application;Development;GUIDesigner;
-EOF
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora            \
+desktop-file-install --vendor=fedora            \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-    --add-category X-Fedora                     \
-    fluid.desktop
+    %{SOURCE1} 
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-convert -resize 48x48 documentation/FL.gif \
-  $RPM_BUILD_ROOT%{_datadir}/pixmaps/fluid.png
+convert -resize 48x48 documentation/FL.gif fluid.png 
+install -p -m644 -D fluid.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/fluid.png
+
+## unpackaged files
+# static libs
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
+%post fluid
+touch --no-create %{_datadir}/icons/hicolor ||:
+
+%postun fluid
+touch --no-create %{_datadir}/icons/hicolor ||:
+
+
 %files
 %defattr(-,root,root,-)
 %doc ANNOUNCEMENT CHANGES COPYING CREDITS README
@@ -111,13 +125,9 @@
 %{_bindir}/fltk-config
 %{_includedir}/FL
 %{_includedir}/Fl
-%{_libdir}/libfltk.a
 %{_libdir}/libfltk.so
-%{_libdir}/libfltk_forms.a
 %{_libdir}/libfltk_forms.so
-%{_libdir}/libfltk_gl.a
 %{_libdir}/libfltk_gl.so
-%{_libdir}/libfltk_images.a
 %{_libdir}/libfltk_images.so
 %{_mandir}/man1/fltk-config.1*
 %{_mandir}/man3/fltk.3*
@@ -127,14 +137,36 @@
 %{_bindir}/fluid
 %{_mandir}/man1/fluid.1*
 %{_datadir}/applications/*fluid.desktop
-%{_datadir}/pixmaps/fluid.png
+%{_datadir}/icons/hicolor/*/*/*
 
-# -----------------------------------------------------------------------------
 
 %changelog
-* Thu Aug 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:1.1.4-9
+* Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.7-2
+- EPEL branch
+- follow icon spec
+- omit static libs
+
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.1.7-1
+- Upstream update
+
+* Thu Nov 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.1.6-4
+- Fixed BR and -devel Requires for modular X
+
+* Sun Nov 13 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.1.6-3
+- Update BuildRequires as well
+
+* Sun Nov 13 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.1.6-2
+- Update Requires for -devel
+
+* Thu Oct 27 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.1.6-1
+- Upstream update
+
+* Thu Aug 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.1.4-10
 - Fixed BR/Requires for x86_64
 
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Thu Nov 20 2003 Dams <anvil[AT]livna.org> 0:1.1.4-0.fdr.8
 - Hopefully fixed Xft flags for rh80
 
@@ -169,5 +201,5 @@
 - Moved fluid to its own package
 - Added missing Requires for devel package
 
-* Sat Aug 16 2003 Dams <anvil[AT]livna.org> 
+* Sat Aug 16 2003 Dams <anvil[AT]livna.org>
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fltk/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:18:58 -0000	1.2
+++ sources	11 Dec 2006 22:49:01 -0000	1.3
@@ -1 +1 @@
-06ce1d3def2df35525592746faccbf98  fltk-1.1.4-source.tar.bz2
+2e29319119adc9d63b2f26b72cae0a88  fltk-1.1.7-source.tar.bz2


