rpms/xforms/devel xforms-1.0.91-no_undefined.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xforms.spec, 1.24, 1.25 xforms-1.0.90-prelink.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Mon Jul 27 14:43:44 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/xforms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8503
Modified Files:
.cvsignore sources xforms.spec
Added Files:
xforms-1.0.91-no_undefined.patch
Removed Files:
xforms-1.0.90-prelink.patch
Log Message:
* Mon Jul 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.91-1
- xforms-1.0.91
- nuke rpaths
- rebase prelink/no_undefined patch
xforms-1.0.91-no_undefined.patch:
gl/Makefile.am | 4 +++-
gl/Makefile.in | 4 ++--
image/Makefile.am | 4 +++-
image/Makefile.in | 4 ++--
lib/Makefile.am | 4 +++-
lib/Makefile.in | 4 ++--
6 files changed, 15 insertions(+), 9 deletions(-)
--- NEW FILE xforms-1.0.91-no_undefined.patch ---
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 \
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xforms/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 17 Oct 2005 14:28:54 -0000 1.3
+++ .cvsignore 27 Jul 2009 14:43:43 -0000 1.4
@@ -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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xforms/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 17 Oct 2005 14:28:54 -0000 1.3
+++ sources 27 Jul 2009 14:43:43 -0000 1.4
@@ -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
Index: xforms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xforms/devel/xforms.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- xforms.spec 27 Jul 2009 08:00:40 -0000 1.24
+++ xforms.spec 27 Jul 2009 14:43:44 -0000 1.25
@@ -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/down
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 eas
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
+%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 at 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 at lists.fedoraproject.org> - 1.0.90-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
--- xforms-1.0.90-prelink.patch DELETED ---
More information about the fedora-extras-commits
mailing list