rpms/xforms
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- xforms-1.0.91

Browse source 
- nuke rpaths
- rebase prelink/no_undefined patch
This commit is contained in:
Rex Dieter 2009-07-27 14:43:44 +00:00
commit 11d07d12ca
5 changed files with 132 additions and 246 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.cvsignore
View file

@ -1,2 +1,2 @@
xforms-1.0.90.tar.gz
xforms-1.0.90.tar.gz.sig
xforms-1.0.91.tar.gz
xforms-1.0.91.tar.gz.sig

4
sources
View file

@ -1,2 +1,2 @@
558b600402430f207e671e2d0d725b6d xforms-1.0.90.tar.gz
23989dbab27a1b406125bde2a2cc2b90 xforms-1.0.90.tar.gz.sig
4eb57f2e095a1ad3adabf25462bad38a xforms-1.0.91.tar.gz
79deab6bb0bd3b0633c79c51781b8b58 xforms-1.0.91.tar.gz.sig

228
xforms-1.0.90-prelink.patch
View file

@ -1,228 +0,0 @@
--- 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 \

105
xforms-1.0.91-no_undefined.patch Normal file
View file

@ -0,0 +1,105 @@
diff -up xforms-1.0.91/gl/Makefile.am.no_undefined xforms-1.0.91/gl/Makefile.am
--- xforms-1.0.91/gl/Makefile.am.no_undefined 2008-09-16 09:42:58.000000000 -0500
+++ xforms-1.0.91/gl/Makefile.am 2009-07-27 08:43:44.135364222 -0500
@@ -7,7 +7,9 @@ include_HEADERS = glcanvas.h
lib_LTLIBRARIES = libformsGL.la
-libformsGL_la_LDFLAGS = -version-info @SO_VERSION@
+libformsGL_la_LDFLAGS = -no-undefined -Wl,--no-undefined -version-info @SO_VERSION@
+
+libformsGL_la_LIBADD = ../lib/libforms.la $(X_LIBS) -lGL -lX11
libformsGL_la_SOURCES = \
glcanvas.c \
diff -up xforms-1.0.91/gl/Makefile.in.no_undefined xforms-1.0.91/gl/Makefile.in
--- xforms-1.0.91/gl/Makefile.in.no_undefined 2008-11-22 13:27:47.000000000 -0600
+++ xforms-1.0.91/gl/Makefile.in 2009-07-27 08:45:33.037370295 -0500
@@ -54,7 +54,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
-libformsGL_la_LIBADD =
+libformsGL_la_LIBADD = ../lib/libforms.la $(X_LIBS) -lGL -lX11
am_libformsGL_la_OBJECTS = glcanvas.lo
libformsGL_la_OBJECTS = $(am_libformsGL_la_OBJECTS)
libformsGL_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -215,7 +215,7 @@ AM_INSTALL_DATA_FLAGS = $(INSTALL) -m 64
INCLUDES = -DMAKING_FORMS -I../lib -I$(top_srcdir)/lib $(X_CFLAGS)
include_HEADERS = glcanvas.h
lib_LTLIBRARIES = libformsGL.la
-libformsGL_la_LDFLAGS = -version-info @SO_VERSION@
+libformsGL_la_LDFLAGS = -no-undefined -Wl,--no-undefined -version-info @SO_VERSION@
libformsGL_la_SOURCES = \
glcanvas.c \
glcanvas.h
diff -up xforms-1.0.91/image/Makefile.am.no_undefined xforms-1.0.91/image/Makefile.am
--- xforms-1.0.91/image/Makefile.am.no_undefined 2008-09-16 09:42:47.000000000 -0500
+++ xforms-1.0.91/image/Makefile.am 2009-07-27 08:46:57.116346261 -0500
@@ -7,7 +7,9 @@ include_HEADERS = flimage.h
lib_LTLIBRARIES = libflimage.la
-libflimage_la_LDFLAGS = -version-info @SO_VERSION@
+libflimage_la_LDFLAGS = -no-undefined -Wl,--no-undefined -version-info @SO_VERSION@
+
+libflimage_la_LIBADD = ../lib/libforms.la $(JPEG_LIB) $(X_LIBS) -lX11
libflimage_la_SOURCES = \
flimage.h \
diff -up xforms-1.0.91/image/Makefile.in.no_undefined xforms-1.0.91/image/Makefile.in
--- xforms-1.0.91/image/Makefile.in.no_undefined 2008-11-22 13:27:47.000000000 -0600
+++ xforms-1.0.91/image/Makefile.in 2009-07-27 08:48:17.802345980 -0500
@@ -54,7 +54,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
-libflimage_la_LIBADD =
+libflimage_la_LIBADD = ../lib/libforms.la $(JPEG_LIB) $(X_LIBS) -lX11
am_libflimage_la_OBJECTS = image.lo image_bmp.lo image_combine.lo \
image_convolve.lo image_crop.lo image_disp.lo image_fits.lo \
image_genesis.lo image_gif.lo image_gzip.lo image_io_filter.lo \
@@ -223,7 +223,7 @@ AM_INSTALL_DATA_FLAGS = $(INSTALL) -m 64
INCLUDES = -DMAKING_FORMS -I../lib -I$(top_srcdir)/lib $(X_CFLAGS)
include_HEADERS = flimage.h
lib_LTLIBRARIES = libflimage.la
-libflimage_la_LDFLAGS = -version-info @SO_VERSION@
+libflimage_la_LDFLAGS = -no-undefined -Wl,--no-undefined -version-info @SO_VERSION@
libflimage_la_SOURCES = \
flimage.h \
flimage_int.h \
diff -up xforms-1.0.91/lib/Makefile.am.no_undefined xforms-1.0.91/lib/Makefile.am
--- xforms-1.0.91/lib/Makefile.am.no_undefined 2008-09-16 09:42:53.000000000 -0500
+++ xforms-1.0.91/lib/Makefile.am 2009-07-27 08:47:09.915346406 -0500
@@ -19,7 +19,9 @@ INCLUDES = -DMAKING_FORMS $(X_CFLAGS)
lib_LTLIBRARIES = libforms.la
-libforms_la_LDFLAGS = -version-info @SO_VERSION@
+libforms_la_LDFLAGS = -no-undefined -Wl,--no-undefined -version-info @SO_VERSION@
+
+libforms_la_LIBADD = $(X_LIBS) $(XPM_LIB) -lX11
libforms_la_SOURCES = \
align.c \
diff -up xforms-1.0.91/lib/Makefile.in.no_undefined xforms-1.0.91/lib/Makefile.in
--- xforms-1.0.91/lib/Makefile.in.no_undefined 2008-11-22 13:27:47.000000000 -0600
+++ xforms-1.0.91/lib/Makefile.in 2009-07-27 08:43:44.136362324 -0500
@@ -53,7 +53,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man5dir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
-libforms_la_LIBADD =
+libforms_la_LIBADD = $(X_LIBS) $(XPM_LIB) -lX11
am_libforms_la_OBJECTS = align.lo appwin.lo asyn_io.lo bitmap.lo \
box.lo browser.lo button.lo canvas.lo chart.lo checkbut.lo \
child.lo choice.lo clipboard.lo clock.lo cmd_br.lo colsel.lo \
@@ -249,7 +249,7 @@ SUBDIRS = bitmaps fd include private
man_MANS = xforms.5
INCLUDES = -DMAKING_FORMS $(X_CFLAGS)
lib_LTLIBRARIES = libforms.la
-libforms_la_LDFLAGS = -version-info @SO_VERSION@
+libforms_la_LDFLAGS = -no-undefined -Wl,--no-undefined -version-info @SO_VERSION@
libforms_la_SOURCES = \
align.c \
appwin.c \

37
xforms.spec
View file

@ -1,8 +1,8 @@
Name: xforms
Summary: XForms toolkit library
Version: 1.0.90
Release: 13%{?dist}
Version: 1.0.91
Release: 1%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@ -11,8 +11,8 @@ 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
## upstreamable patches
Patch50: xforms-1.0.91-no_undefined.patch
BuildRequires: libjpeg-devel
BuildRequires: libGL-devel
@ -36,7 +36,6 @@ 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.
%package devel
Summary: Development files for the XForms toolkit library
Group: Development/Libraries
@ -48,14 +47,15 @@ Requires: libjpeg-devel
%prep
%setup -q
%patch1 -p1 -b .prelink
%patch50 -p1 -b .no_undefined
# rpath hack
sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
%build
%configure \
--disable-static \
--enable-optimization="$RPM_OPT_FLAGS"
@ -82,19 +82,28 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%defattr(-,root,root-)
%doc COPYING.LIB Copyright ChangeLog NEWS README
%{_libdir}/lib*.so.*
%{_libdir}/libflimage.so.1*
%{_libdir}/libformsGL.so.1*
%{_libdir}/libforms.so.1*
%files devel
%defattr(-,root,root)
%{_bindir}/*
%{_includedir}/*
%defattr(-,root,root,-)
%{_bindir}/fd2ps
%{_bindir}/fdesign
%{_includedir}/*.h
%{_libdir}/lib*.so
%{_mandir}/man*/*
%{_mandir}/man1/*
%{_mandir}/man5/*
%changelog
* Mon Jul 27 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.0.91-1
- xforms-1.0.91
- nuke rpaths
- rebase prelink/no_undefined patch
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.90-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild