dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-xforms-1.0.tar.gz

.gitignore

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

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xforms
-# $Id$
-NAME := xforms
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1,2 @@
-64adf1c489b629a92218f7c140f4bdaf  xforms-1.0.tar.gz
+558b600402430f207e671e2d0d725b6d  xforms-1.0.90.tar.gz
+23989dbab27a1b406125bde2a2cc2b90  xforms-1.0.90.tar.gz.sig

xforms-1.0.90-prelink.patch

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

xforms.spec

@@ -1,68 +1,74 @@
-# $Id: xforms.spec,v 1.4 2004/11/08 05:34:32 cvsextras Exp $
 
-# Since we're using xmkmf, we must match XFree86's notion of these
+Name:    xforms
-%define _x11dir	/usr/X11R6
+Summary: XForms toolkit library
-%define _prefix %{_x11dir}
+Version: 1.0.90
-%define _mandir %{_prefix}/man
+Release: 8%{?dist}
 
-Name:	 xforms
-Summary: An X11 toolkit library.
-Epoch:	 0
-Version: 1.0
-Release: 0.fdr.2%{?dist_tag}.2
 License: LGPL
-Group:	 System Environment/Libraries
+Group:   System Environment/Libraries
-Url:	 http://www.nongnu.org/xforms/ 
+URL:     http://www.nongnu.org/xforms/
-Source:  http://savannah.nongnu.org/download/xforms/stable.pkg/%{version}/%{name}-%{version}.tar.gz 
+Source0: http://savannah.nongnu.org/download/xforms/xforms-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+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
+%define x_deps xorg-x11-devel
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+%define x_deps libX11-devel libXpm-devel
+%endif
+BuildRequires: %{x_deps}
 
-# 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.
+XForms is a GUI toolkit based on Xlib for X Window Systems. It
-This package contains the runtime libraries for the xforms toolkit.
+features a rich set of objects, such as buttons, sliders, and menus
-
+etc. integrated into an easy and efficient object/event callback
-It has now gone Open Source (LGPL).
+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.
+Summary: Development files for the XForms toolkit library
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
-# legacy versions included -designer/-static subpkgs
+Requires: %{x_deps}
-Obsoletes: %{name}-designer < %{epoch}:%{version}-%{release}
+Requires: libjpeg-devel
-Provides:  %{name}-designer = %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-static < %{epoch}:%{version}-%{release}
-Provides:  %{name}-static = %{epoch}:%{version}-%{release}
 %description devel
-This package contains development headers and libraries for %{name}.
+%{summary}.
-
-Install this if you intend to develop / compile programs with %{name}.
 
 
 %prep
 
-%setup -q 
+%setup -q
+
+%patch1 -p1 -b .prelink
 
 
 %build
 
-(unset RPM_OPT_FLAGS; xmkmf -a)
+%configure \
+  --disable-static \
+  --enable-optimization="$RPM_OPT_FLAGS"
 
-make %{?_smp_mflags} \
+make %{?_smp_mflags} X_PRE_LIBS=""
-	CDEBUGFLAGS="$RPM_OPT_FLAGS" 
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# makeinstall macro doesn't work for this pkg.
+make install DESTDIR=$RPM_BUILD_ROOT
-make install install.man DESTDIR="$RPM_BUILD_ROOT" 
+
+## Unpackaged files
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 
 %clean
@@ -70,24 +76,61 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 
-%files 
+%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*/*
-%{_mandir}/man*/fd*
 
 
-%changelog
+%changelog 
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-8
+- fc6 respin
+
+* Tue Aug 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-7
+- cleanup
+
+* Wed Mar 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 
+- fc5: gcc/glibc respin
+
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-6
+- -devel: Req: libjpeg-devel(flimage), libXpm-devel
+
+* 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)
+
+* Sun May 22 2005 Jeremy Katz <katzj@redhat.com> - 1.0-4
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Sun Nov 23 2003 Rex Dieter <rexdieter at sf.net> 0:1.0-0.fdr.2
 - update for Fedora Core support
 - remove extraneous macros