rpms/xforms/FC-4 xforms-1.0.90-prelink.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xforms.spec, 1.8, 1.9
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Tue Jan 3 19:34:24 UTC 2006
- Previous message (by thread): rpms/shorewall/devel shorewall-3.0.3-init.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 shorewall.spec, 1.15, 1.16 sources, 1.9, 1.10 shorewall-2.4.4-init.patch, 1.1, NONE
- Next message (by thread): rpms/clisp/FC-3 .cvsignore, 1.3, 1.4 clisp.spec, 1.10, 1.11 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/extras/rpms/xforms/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31525
Modified Files:
.cvsignore sources xforms.spec
Added Files:
xforms-1.0.90-prelink.patch
Log Message:
sync w/devel, update to 1.0.90
xforms-1.0.90-prelink.patch:
--- NEW FILE xforms-1.0.90-prelink.patch ---
--- xforms-1.0.90/fd2ps/Makefile.in.prelink 2004-03-30 03:48:44.000000000 -0600
+++ xforms-1.0.90/fd2ps/Makefile.in 2006-01-02 15:18:01.000000000 -0600
@@ -115,7 +115,7 @@
bin_PROGRAMS = fd2ps
-fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
fd2ps_SOURCES = \
align.c \
--- xforms-1.0.90/fd2ps/Makefile.am.prelink 2003-11-13 15:46:47.000000000 -0600
+++ xforms-1.0.90/fd2ps/Makefile.am 2006-01-02 15:18:10.000000000 -0600
@@ -16,7 +16,7 @@
bin_PROGRAMS = fd2ps
-fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
fd2ps_SOURCES = \
align.c \
--- xforms-1.0.90/image/Makefile.in.prelink 2004-03-30 03:48:46.000000000 -0600
+++ xforms-1.0.90/image/Makefile.in 2006-01-02 15:05:52.000000000 -0600
@@ -109,7 +109,7 @@
lib_LTLIBRARIES = libflimage.la
-libflimage_la_LDFLAGS = -version-info 1:0:0
+libflimage_la_LDFLAGS = ../lib/libforms.la $(JPEG_LIB) $(X_LIBS) -lX11 -version-info 1:0:0
libflimage_la_SOURCES = \
flimage.h \
--- xforms-1.0.90/image/Makefile.am.prelink 2003-11-13 15:46:48.000000000 -0600
+++ xforms-1.0.90/image/Makefile.am 2006-01-02 15:05:50.000000000 -0600
@@ -7,7 +7,7 @@
lib_LTLIBRARIES = libflimage.la
-libflimage_la_LDFLAGS = -version-info 1:0:0
+libflimage_la_LDFLAGS = ../lib/libforms.la $(JPEG_LIB) $(X_LIBS) -lX11 -version-info 1:0:0
libflimage_la_SOURCES = \
flimage.h \
--- xforms-1.0.90/gl/Makefile.in.prelink 2004-03-30 03:48:46.000000000 -0600
+++ xforms-1.0.90/gl/Makefile.in 2006-01-02 15:04:24.000000000 -0600
@@ -109,7 +109,7 @@
lib_LTLIBRARIES = libformsGL.la
-libformsGL_la_LDFLAGS = -version-info 1:0:0
+libformsGL_la_LDFLAGS = ../lib/libforms.la $(X_LIBS) -lGL -version-info 1:0:0
libformsGL_la_SOURCES = \
glcanvas.c \
--- xforms-1.0.90/gl/Makefile.am.prelink 2003-11-20 03:33:11.000000000 -0600
+++ xforms-1.0.90/gl/Makefile.am 2006-01-02 15:04:20.000000000 -0600
@@ -7,7 +7,7 @@
lib_LTLIBRARIES = libformsGL.la
-libformsGL_la_LDFLAGS = -version-info 1:0:0
+libformsGL_la_LDFLAGS = ../lib/libforms.la $(X_LIBS) -lGL -version-info 1:0:0
libformsGL_la_SOURCES = \
glcanvas.c \
--- xforms-1.0.90/demos/Makefile.in.prelink 2004-03-30 03:48:44.000000000 -0600
+++ xforms-1.0.90/demos/Makefile.in 2006-01-02 15:07:41.000000000 -0600
@@ -206,7 +206,7 @@
# Most of these demos link against libforms only. For them this default is
# sufficient:
-AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
arrowbutton_SOURCES = arrowbutton.c
borderwidth_SOURCES = borderwidth.c
@@ -263,12 +263,12 @@
gl_SOURCES = gl.c
gl_LDADD = ../lib/libforms.la ../gl/libformsGL.la \
- $(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+ $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
glwin_SOURCES = glwin.c
glwin_LDADD = ../lib/libforms.la ../gl/libformsGL.la \
- $(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+ $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
goodies_SOURCES = goodies.c
@@ -276,7 +276,7 @@
ibrowser_SOURCES = ibrowser.c
ibrowser_LDADD = ../image/libflimage.la ../lib/libforms.la \
- $(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+ $(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
$(X_EXTRA_LIBS)
@@ -284,7 +284,7 @@
iconvert_SOURCES = iconvert.c
iconvert_LDADD = ../image/libflimage.la ../lib/libforms.la \
- $(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+ $(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
$(X_EXTRA_LIBS)
@@ -295,7 +295,7 @@
itest_SOURCES = itest.c
itest_LDADD = ../image/libflimage.la ../lib/libforms.la \
- $(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+ $(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
$(X_EXTRA_LIBS)
@@ -304,7 +304,7 @@
ll_SOURCES = ll.c
ll_LDADD = ../image/libflimage.la ../lib/libforms.la \
- $(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+ $(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
$(X_EXTRA_LIBS)
@@ -355,7 +355,7 @@
xyplotover_SOURCES = xyplotover.c
xyplotover_LDADD = ../image/libflimage.la ../lib/libforms.la \
- $(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+ $(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
$(X_EXTRA_LIBS)
--- xforms-1.0.90/demos/Makefile.am.prelink 2004-02-24 09:42:43.000000000 -0600
+++ xforms-1.0.90/demos/Makefile.am 2006-01-02 15:19:03.000000000 -0600
@@ -105,7 +105,7 @@
# Most of these demos link against libforms only. For them this default is
# sufficient:
-AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
arrowbutton_SOURCES = arrowbutton.c
borderwidth_SOURCES = borderwidth.c
@@ -168,11 +168,11 @@
gl_SOURCES = gl.c
gl_LDADD = ../lib/libforms.la ../gl/libformsGL.la \
- $(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+ $(X_LIBS) $(X_PRE_LIBS) -lGL $(LIBS) $(X_EXTRA_LIBS)
glwin_SOURCES = glwin.c
glwin_LDADD = ../lib/libforms.la ../gl/libformsGL.la \
- $(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+ $(X_LIBS) $(X_PRE_LIBS) -lGL $(LIBS) $(X_EXTRA_LIBS)
goodies_SOURCES = goodies.c
group_SOURCES = group.c
@@ -180,14 +180,14 @@
ibrowser_SOURCES = ibrowser.c
ibrowser.$(OBJEXT): fd/ibrowser_gui.c
ibrowser_LDADD = ../image/libflimage.la ../lib/libforms.la \
- $(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+ $(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
$(X_EXTRA_LIBS)
iconify_SOURCES = iconify.c
iconvert_SOURCES = iconvert.c
iconvert_LDADD = ../image/libflimage.la ../lib/libforms.la \
- $(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+ $(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
$(X_EXTRA_LIBS)
inputall_SOURCES = inputall.c
@@ -199,7 +199,7 @@
itest_SOURCES = itest.c
itest.$(OBJEXT): fd/is_gui.c
itest_LDADD = ../image/libflimage.la ../lib/libforms.la \
- $(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+ $(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
$(X_EXTRA_LIBS)
lalign_SOURCES = lalign.c
@@ -207,7 +207,7 @@
ll_SOURCES = ll.c
ll_LDADD = ../image/libflimage.la ../lib/libforms.la \
- $(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+ $(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
$(X_EXTRA_LIBS)
longlabel_SOURCES = longlabel.c
@@ -260,7 +260,7 @@
xyplotover_SOURCES = xyplotover.c
xyplotover_LDADD = ../image/libflimage.la ../lib/libforms.la \
- $(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+ $(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
$(X_EXTRA_LIBS)
yesno_SOURCES = yesno.c
--- xforms-1.0.90/lib/Makefile.in.prelink 2004-03-30 03:48:46.000000000 -0600
+++ xforms-1.0.90/lib/Makefile.in 2006-01-02 14:52:11.000000000 -0600
@@ -116,7 +116,7 @@
lib_LTLIBRARIES = libforms.la
-libforms_la_LDFLAGS = -version-info 1:0:0
+libforms_la_LDFLAGS = $(X_LIBS) $(XPM_LIB) -lX11 -version-info 1:0:0
libforms_la_SOURCES = \
align.c \
--- xforms-1.0.90/lib/Makefile.am.prelink 2003-11-20 03:33:16.000000000 -0600
+++ xforms-1.0.90/lib/Makefile.am 2006-01-02 14:52:19.000000000 -0600
@@ -17,7 +17,7 @@
lib_LTLIBRARIES = libforms.la
-libforms_la_LDFLAGS = -version-info 1:0:0
+libforms_la_LDFLAGS = $(X_LIBS) $(XPM_LIB) -lX11 -version-info 1:0:0
libforms_la_SOURCES = \
align.c \
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xforms/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 05:33:57 -0000 1.2
+++ .cvsignore 3 Jan 2006 19:34:24 -0000 1.3
@@ -1 +1,2 @@
-xforms-1.0.tar.gz
+xforms-1.0.90.tar.gz
+xforms-1.0.90.tar.gz.sig
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xforms/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 05:33:57 -0000 1.2
+++ sources 3 Jan 2006 19:34:24 -0000 1.3
@@ -1 +1,2 @@
-64adf1c489b629a92218f7c140f4bdaf xforms-1.0.tar.gz
+558b600402430f207e671e2d0d725b6d xforms-1.0.90.tar.gz
+23989dbab27a1b406125bde2a2cc2b90 xforms-1.0.90.tar.gz.sig
Index: xforms.spec
===================================================================
RCS file: /cvs/extras/rpms/xforms/FC-4/xforms.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xforms.spec 23 May 2005 00:21:33 -0000 1.8
+++ xforms.spec 3 Jan 2006 19:34:24 -0000 1.9
@@ -1,68 +1,74 @@
-# $Id$
-
-# Since we're using xmkmf, we must match XFree86's notion of these
-%define _x11dir /usr/X11R6
-%define _prefix %{_x11dir}
-%define _mandir %{_prefix}/man
Name: xforms
-Summary: X11 toolkit library
-Version: 1.0
-Release: 4%{?dist_tag}
+Summary: XForms toolkit library
+Version: 1.0.90
+Release: 5%{?dist}
License: LGPL
Group: System Environment/Libraries
URL: http://www.nongnu.org/xforms/
-Source: http://savannah.nongnu.org/download/xforms/stable.pkg/%{version}/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Source0: http://savannah.nongnu.org/download/xforms/xforms-%{version}.tar.gz
+Source1: http://savannah.nongnu.org/download/xforms/xforms-%{version}.tar.gz.sig
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# TODO: remove -lc (all), -lm (most) linker steps
+Patch1: xforms-1.0.90-prelink.patch
-BuildRequires: XFree86-devel
BuildRequires: libjpeg-devel
-BuildRequires: libtiff-devel
+BuildRequires: libGL-devel
+%if "%{?fedora}" > "4"
+BuildRequires: libXpm-devel
+%define x_deps libX11-devel
+%endif
-# for xforms' import/export of various image types, including: png, sgi
+# import/export: png, sgi (optional?)
Requires: netpbm-progs
+# import eps,ps (optional?)
+#Requires: ghostscript
%description
-xforms is an X11 toolkit library.
-This package contains the runtime libraries for the xforms toolkit.
+XForms is a GUI toolkit based on Xlib for X Window Systems. It
+features a rich set of objects, such as buttons, sliders, and menus
+etc. integrated into an easy and efficient object/event callback
+execution model that allows fast and easy construction of
+X-applications. In addition, the library is extensible and new objects
+can easily be created and added to the library.
-It has now gone Open Source (LGPL).
%package devel
-Summary: Development files for the xforms toolkit
+Summary: Development files for the XForms toolkit library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-# legacy versions included -designer/-static subpkgs
-Obsoletes: %{name}-designer < %{version}-%{release}
-Provides: %{name}-designer = %{version}-%{release}
-Obsoletes: %{name}-static < %{version}-%{release}
-Provides: %{name}-static = %{version}-%{release}
+Requires: %{?x_deps}%{!?x_deps:XFree86-devel}
%description devel
-This package contains development headers and libraries for %{name}.
-
-Install this if you intend to develop / compile programs with %{name}.
+%{summary}.
%prep
%setup -q
+%patch1 -p1 -b .prelink
+
%build
-(unset RPM_OPT_FLAGS; xmkmf -a)
+%configure \
+ --disable-static \
+ --enable-optimization="$RPM_OPT_FLAGS"
make %{?_smp_mflags} \
- CDEBUGFLAGS="$RPM_OPT_FLAGS"
+ X_PRE_LIBS=''
%install
rm -rf $RPM_BUILD_ROOT
-# makeinstall macro doesn't work for this pkg.
-make install install.man DESTDIR="$RPM_BUILD_ROOT"
+make install DESTDIR=$RPM_BUILD_ROOT
+
+## Unpackaged files
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
%clean
@@ -70,24 +76,43 @@
%post -p /sbin/ldconfig
+
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root)
-%doc *README Changes Copyright COPYING
+%doc COPYING.LIB Copyright ChangeLog NEWS README
%{_libdir}/lib*.so.*
%files devel
%defattr(-,root,root)
-%{_bindir}/fd*
+%{_bindir}/*
%{_includedir}/*
%{_libdir}/lib*.so
-%{_libdir}/lib*.a
-%{_mandir}/man*/fd*
+%{_mandir}/man*/*
+
+
+%changelog
+* Mon Jan 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-5
+- prelink.patch: fix undefined symbols in (shared) lib(s)
+
+* Mon Dec 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-4
+- BR: libXpm-devel
+- -devel: Req: libX11-devel
+
+* Mon Oct 17 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-3
+- BR: libGL-devel
+- #BR: libXpm-devel (coming soon)
+
+* Mon Oct 17 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-2
+- BR: libGL.so.1 -> BR: %%x_pkg-Mesa-libGL
+- remove legacy crud
+* Mon Oct 17 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-1
+- 1.0.90
+- new version removes use-of/references-to xmkmf,/usr/X11R6 (#170942)
-%changelog
* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.0-4
- rebuild on all arches
- Previous message (by thread): rpms/shorewall/devel shorewall-3.0.3-init.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 shorewall.spec, 1.15, 1.16 sources, 1.9, 1.10 shorewall-2.4.4-init.patch, 1.1, NONE
- Next message (by thread): rpms/clisp/FC-3 .cvsignore, 1.3, 1.4 clisp.spec, 1.10, 1.11 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list