robert pushed to xforms (el5). "Merge remote branch 'origin/master' into el5 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 8 14:32:33 UTC 2015
>From 0191350c1eb88fe6c873b58e004f0ec543a756e6 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Sat, 11 Aug 2007 21:55:37 +0000
Subject: - License: LGPLv2+
diff --git a/xforms.spec b/xforms.spec
index 0682cd3..34f85e1 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -2,9 +2,9 @@
Name: xforms
Summary: XForms toolkit library
Version: 1.0.90
-Release: 8%{?dist}
+Release: 9%{?dist}
-License: LGPL
+License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.nongnu.org/xforms/
Source0: http://savannah.nongnu.org/download/xforms/xforms-%{version}.tar.gz
@@ -17,7 +17,7 @@ Patch1: xforms-1.0.90-prelink.patch
BuildRequires: libjpeg-devel
BuildRequires: libGL-devel
%define x_deps xorg-x11-devel
-%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
%define x_deps libX11-devel libXpm-devel
%endif
BuildRequires: %{x_deps}
@@ -95,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.0.90-9
+- License: LGPLv2+
+
* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-8
- fc6 respin
--
cgit v0.10.2
>From 2327ec262fbf292af6a8ca28243a2f7d61e48542 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Wed, 22 Aug 2007 03:15:43 +0000
Subject: - respin (BuildID)
diff --git a/xforms.spec b/xforms.spec
index 34f85e1..2583bf2 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -2,7 +2,7 @@
Name: xforms
Summary: XForms toolkit library
Version: 1.0.90
-Release: 9%{?dist}
+Release: 10%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -95,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Aug 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.0.90-10
+- respin (BuildID)
+
* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.0.90-9
- License: LGPLv2+
--
cgit v0.10.2
>From 2710841b0dbd2e91e0e778ec4febd5ad27708a61 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri, 8 Feb 2008 21:20:24 +0000
Subject: - respin (gcc43)
diff --git a/xforms.spec b/xforms.spec
index 2583bf2..7729b6f 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -2,7 +2,7 @@
Name: xforms
Summary: XForms toolkit library
Version: 1.0.90
-Release: 10%{?dist}
+Release: 11%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -95,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Feb 08 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0.90-11
+- respin (gcc43)
+
* Tue Aug 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.0.90-10
- respin (BuildID)
--
cgit v0.10.2
>From 1b694e045808bbd08ff95cc9175c407ee0a82eaa Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating at fedoraproject.org>
Date: Thu, 26 Feb 2009 09:24:27 +0000
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/xforms.spec b/xforms.spec
index 7729b6f..da58c43 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -2,7 +2,7 @@
Name: xforms
Summary: XForms toolkit library
Version: 1.0.90
-Release: 11%{?dist}
+Release: 12%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -94,7 +94,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man*/*
-%changelog
+%changelog
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.90-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
* Fri Feb 08 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0.90-11
- respin (gcc43)
--
cgit v0.10.2
>From 07fbeb1b6cb5971385c9d2786bae1ff2f6c95fe5 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating at fedoraproject.org>
Date: Mon, 27 Jul 2009 08:00:40 +0000
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/xforms.spec b/xforms.spec
index da58c43..8aa3a3f 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -2,7 +2,7 @@
Name: xforms
Summary: XForms toolkit library
Version: 1.0.90
-Release: 12%{?dist}
+Release: 13%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -95,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* 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
+
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.90-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
--
cgit v0.10.2
>From 11d07d12ca7536fcc2880ecae29755bbde4a718b Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Mon, 27 Jul 2009 14:43:44 +0000
Subject: - xforms-1.0.91 - nuke rpaths - rebase prelink/no_undefined patch
diff --git a/.cvsignore b/.cvsignore
index 6f4e628..6f8300f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -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
diff --git a/sources b/sources
index a4fa16d..91db98a 100644
--- a/sources
+++ b/sources
@@ -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
diff --git a/xforms-1.0.90-prelink.patch b/xforms-1.0.90-prelink.patch
deleted file mode 100644
index ef8550a..0000000
--- a/xforms-1.0.90-prelink.patch
+++ /dev/null
@@ -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 \
diff --git a/xforms-1.0.91-no_undefined.patch b/xforms-1.0.91-no_undefined.patch
new file mode 100644
index 0000000..99928f5
--- /dev/null
+++ b/xforms-1.0.91-no_undefined.patch
@@ -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 \
diff --git a/xforms.spec b/xforms.spec
index 8aa3a3f..0619cc8 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -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
+%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
--
cgit v0.10.2
>From c30f75e523d773b8b5094931788a0700ac4ea480 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Mon, 27 Jul 2009 15:28:25 +0000
Subject: sent patch upstream
diff --git a/xforms.spec b/xforms.spec
index 0619cc8..723fae2 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -11,8 +11,9 @@ 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)
-## upstreamable patches
-Patch50: xforms-1.0.91-no_undefined.patch
+## upstreamed patches
+# http://savannah.nongnu.org/support/?106948
+Patch100: xforms-1.0.91-no_undefined.patch
BuildRequires: libjpeg-devel
BuildRequires: libGL-devel
@@ -49,7 +50,7 @@ Requires: libjpeg-devel
%prep
%setup -q
-%patch50 -p1 -b .no_undefined
+%patch100 -p1 -b .no_undefined
# rpath hack
sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
--
cgit v0.10.2
>From 8201e5d6fb8433909f35feb1eaf97c2812cfe8b1 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Mon, 31 Aug 2009 12:41:37 +0000
Subject: - %files: fix %defattr typo - drop libXpm-devel from x_deps
diff --git a/xforms.spec b/xforms.spec
index 723fae2..be8039c 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -2,7 +2,7 @@
Name: xforms
Summary: XForms toolkit library
Version: 1.0.91
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -16,10 +16,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch100: xforms-1.0.91-no_undefined.patch
BuildRequires: libjpeg-devel
-BuildRequires: libGL-devel
-%define x_deps xorg-x11-devel
+%define x_deps xorg-x11-devel libGL-devel
%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-%define x_deps libX11-devel libXpm-devel
+BuildRequires: libXpm-devel
+# skip xorg-x11-proto-devel, for now, pulled in indirectly via libX11-devel
+%define x_deps libGL-devel libX11-devel
%endif
BuildRequires: %{x_deps}
@@ -40,9 +41,8 @@ can easily be created and added to the library.
%package devel
Summary: Development files for the XForms toolkit library
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: %{x_deps}
-Requires: libjpeg-devel
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{?x_deps}
%description devel
%{summary}.
@@ -83,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root-)
+%defattr(-,root,root,-)
%doc COPYING.LIB Copyright ChangeLog NEWS README
%{_libdir}/libflimage.so.1*
%{_libdir}/libformsGL.so.1*
@@ -100,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.9.91-2
+- %%files: fix %%defattr typo
+- drop libXpm-devel from x_deps
+
* Mon Jul 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.91-1
- xforms-1.0.91
- nuke rpaths
--
cgit v0.10.2
>From 5ec5d8b46cb1cae68a7349380e72851bbe7c0525 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Mon, 31 Aug 2009 15:39:45 +0000
Subject: - xforms-1.0.92pre7
diff --git a/.cvsignore b/.cvsignore
index 6f8300f..306b810 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-xforms-1.0.91.tar.gz
-xforms-1.0.91.tar.gz.sig
+xforms-1.0.92pre7.tar.gz
+xforms-1.0.92pre7.tar.gz.sig
diff --git a/sources b/sources
index 91db98a..c18dd58 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-4eb57f2e095a1ad3adabf25462bad38a xforms-1.0.91.tar.gz
-79deab6bb0bd3b0633c79c51781b8b58 xforms-1.0.91.tar.gz.sig
+fe7c0ecc94685e9eb6ebfffaaa1d6e01 xforms-1.0.92pre7.tar.gz
+101b7103709fc2964474c48af2367da4 xforms-1.0.92pre7.tar.gz.sig
diff --git a/xforms-1.0.91-no_undefined.patch b/xforms-1.0.91-no_undefined.patch
deleted file mode 100644
index 99928f5..0000000
--- a/xforms-1.0.91-no_undefined.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-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 \
diff --git a/xforms.spec b/xforms.spec
index be8039c..78ce71a 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -1,19 +1,19 @@
+%define pre pre7
+
Name: xforms
Summary: XForms toolkit library
-Version: 1.0.91
-Release: 2%{?dist}
+Version: 1.0.92
+Release: 0.1.%{pre}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.nongnu.org/xforms/
-Source0: http://savannah.nongnu.org/download/xforms/xforms-%{version}.tar.gz
-Source1: http://savannah.nongnu.org/download/xforms/xforms-%{version}.tar.gz.sig
+Source0: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz
+Source1: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz.sig
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## upstreamed patches
-# http://savannah.nongnu.org/support/?106948
-Patch100: xforms-1.0.91-no_undefined.patch
BuildRequires: libjpeg-devel
%define x_deps xorg-x11-devel libGL-devel
@@ -48,9 +48,7 @@ Requires: %{?x_deps}
%prep
-%setup -q
-
-%patch100 -p1 -b .no_undefined
+%setup -q -n %{name}-%{version}%{?pre}
# rpath hack
sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
@@ -100,7 +98,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.9.91-2
+* Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.92-0.1.pre7
+- xforms-1.0.92pre7
+
+* Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.91-2
- %%files: fix %%defattr typo
- drop libXpm-devel from x_deps
--
cgit v0.10.2
>From c43e799efa64e58ec6100c228769b9616a2cc3f7 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Mon, 31 Aug 2009 19:47:16 +0000
Subject: update URL
diff --git a/xforms.spec b/xforms.spec
index 78ce71a..a271790 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -8,7 +8,8 @@ Release: 0.1.%{pre}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
-URL: http://www.nongnu.org/xforms/
+#URL: http://www.nongnu.org/xforms/
+URL: http://xforms-toolkit.org/
Source0: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz
Source1: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz.sig
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
--
cgit v0.10.2
>From 623c4b25d1f2f7999a8e97b22b435c90eb1ffa07 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Wed, 2 Sep 2009 12:42:13 +0000
Subject: - xforms-1.0.92pre8
diff --git a/.cvsignore b/.cvsignore
index 306b810..bd7247a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-xforms-1.0.92pre7.tar.gz
-xforms-1.0.92pre7.tar.gz.sig
+xforms-1.0.92pre8.tar.gz
+xforms-1.0.92pre8.tar.gz.sig
diff --git a/sources b/sources
index c18dd58..f8412ae 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-fe7c0ecc94685e9eb6ebfffaaa1d6e01 xforms-1.0.92pre7.tar.gz
-101b7103709fc2964474c48af2367da4 xforms-1.0.92pre7.tar.gz.sig
+6f5092966b20f63acdc5c7e6c13436f3 xforms-1.0.92pre8.tar.gz
+3dc664cc57369f018af53079f49da016 xforms-1.0.92pre8.tar.gz.sig
diff --git a/xforms.spec b/xforms.spec
index a271790..babc1b9 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -1,10 +1,10 @@
-%define pre pre7
+%define pre pre8
Name: xforms
Summary: XForms toolkit library
Version: 1.0.92
-Release: 0.1.%{pre}%{?dist}
+Release: 0.2.%{pre}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Sep 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.92-0.2.pre8
+- xforms-1.0.92pre8
+
* Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.92-0.1.pre7
- xforms-1.0.92pre7
--
cgit v0.10.2
>From 406143908b3f5674f4871cb5490e2758fa50b955 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Mon, 21 Sep 2009 17:29:35 +0000
Subject: - xforms-1.0.92sp1
diff --git a/.cvsignore b/.cvsignore
index bd7247a..2500a11 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-xforms-1.0.92pre8.tar.gz
-xforms-1.0.92pre8.tar.gz.sig
+xforms-1.0.92sp1.tar.gz
diff --git a/sources b/sources
index f8412ae..28f273f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-6f5092966b20f63acdc5c7e6c13436f3 xforms-1.0.92pre8.tar.gz
-3dc664cc57369f018af53079f49da016 xforms-1.0.92pre8.tar.gz.sig
+3d23731c0bdd065b54d258c92d15cbd2 xforms-1.0.92sp1.tar.gz
diff --git a/xforms.spec b/xforms.spec
index babc1b9..296ff4a 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -1,21 +1,19 @@
-%define pre pre8
+%define pre sp1
Name: xforms
Summary: XForms toolkit library
Version: 1.0.92
-Release: 0.2.%{pre}%{?dist}
+Release: 1.%{pre}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
#URL: http://www.nongnu.org/xforms/
URL: http://xforms-toolkit.org/
Source0: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz
-Source1: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz.sig
+#Source1: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz.sig
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-## upstreamed patches
-
BuildRequires: libjpeg-devel
%define x_deps xorg-x11-devel libGL-devel
%if 0%{?fedora} > 4 || 0%{?rhel} > 4
@@ -99,6 +97,15 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.92-1.sp1
+- xforms-1.0.92sp1
+
+* Tue Sep 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.92-0.4.pre13
+- xforms-1.0.92pre13
+
+* Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.92-0.3.pre12
+- xforms-1.0.92pre12
+
* Wed Sep 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.92-0.2.pre8
- xforms-1.0.92pre8
--
cgit v0.10.2
>From 3c19e8b27f5545c2c3035086ea004ddeba57fd16 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Thu, 5 Nov 2009 15:25:43 +0000
Subject: - xforms-1.9.92sp2
diff --git a/.cvsignore b/.cvsignore
index 2500a11..4d79ff4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xforms-1.0.92sp1.tar.gz
+xforms-1.0.92sp2.tar.gz
diff --git a/sources b/sources
index 28f273f..3ed810b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3d23731c0bdd065b54d258c92d15cbd2 xforms-1.0.92sp1.tar.gz
+3c2806dff3022c536eabd93d32e3dab7 xforms-1.0.92sp2.tar.gz
diff --git a/xforms.spec b/xforms.spec
index 296ff4a..e9e9735 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -1,10 +1,10 @@
-%define pre sp1
+%define pre sp2
Name: xforms
Summary: XForms toolkit library
Version: 1.0.92
-Release: 1.%{pre}%{?dist}
+Release: 2.%{pre}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Nov 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.92-2.sp2
+- xforms-1.9.92sp2
+
* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.92-1.sp1
- xforms-1.0.92sp1
--
cgit v0.10.2
>From b738766ce48b051edef2b8169d8d715d093a1570 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting at fedoraproject.org>
Date: Wed, 25 Nov 2009 22:40:58 +0000
Subject: Fix typo that causes a failure to update the common directory.
(releng #2781)
diff --git a/Makefile b/Makefile
index b10ce79..444b49b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ 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
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
--
cgit v0.10.2
>From 147c4d6f2b622c8dc3e297786ae13ff00fc344fb Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Tue, 18 May 2010 16:48:38 +0000
Subject: - xforms-1.0.93pre7 - Requires: xorg-x11-fonts-ISO8859-1-75dpi
diff --git a/.cvsignore b/.cvsignore
index 4d79ff4..2315169 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
-xforms-1.0.92sp2.tar.gz
+xforms-1.0.93pre7.tar.gz
+xforms-1.0.93pre7.tar.gz.sig
diff --git a/sources b/sources
index 3ed810b..650d6d2 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-3c2806dff3022c536eabd93d32e3dab7 xforms-1.0.92sp2.tar.gz
+9e5317c49c233d3a4f9a59b86f7806c1 xforms-1.0.93pre7.tar.gz
+69df84af137bb7bb20a8276f9cee1066 xforms-1.0.93pre7.tar.gz.sig
diff --git a/xforms.spec b/xforms.spec
index e9e9735..977fff9 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -1,17 +1,19 @@
-%define pre sp2
+%define pre pre7
Name: xforms
Summary: XForms toolkit library
-Version: 1.0.92
-Release: 2.%{pre}%{?dist}
+Version: 1.0.93
+Release: 0.1.%{pre}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
#URL: http://www.nongnu.org/xforms/
URL: http://xforms-toolkit.org/
-Source0: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz
+#Source0: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz
#Source1: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz.sig
+Source0: http://download.savannah.gnu.org/releases-noredirect/xforms/xforms-%{version}%{?pre}.tar.gz
+Source1: http://download.savannah.gnu.org/releases-noredirect/xforms/xforms-%{version}%{?pre}.tar.gz.sig
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel
@@ -27,7 +29,8 @@ BuildRequires: %{x_deps}
Requires: netpbm-progs
# import eps,ps (optional?)
#Requires: ghostscript
-
+# eww, http://lists.nongnu.org/archive/html/xforms-development/2010-05/msg00000.html
+Requires: xorg-x11-fonts-ISO8859-1-75dpi
%description
XForms is a GUI toolkit based on Xlib for X Window Systems. It
@@ -82,9 +85,9 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc COPYING.LIB Copyright ChangeLog NEWS README
-%{_libdir}/libflimage.so.1*
-%{_libdir}/libformsGL.so.1*
-%{_libdir}/libforms.so.1*
+%{_libdir}/libflimage.so.2*
+%{_libdir}/libformsGL.so.2*
+%{_libdir}/libforms.so.2*
%files devel
%defattr(-,root,root,-)
@@ -97,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue May 18 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.0.93-0.1.pre7
+- xforms-1.0.93pre7
+- Requires: xorg-x11-fonts-ISO8859-1-75dpi
+
* Thu Nov 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.92-2.sp2
- xforms-1.9.92sp2
--
cgit v0.10.2
>From 0cdc006cf2559f3bbb9aa566c1ffaf07198136a2 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Sun, 23 May 2010 20:07:03 +0000
Subject: - xforms-1.0.93
diff --git a/.cvsignore b/.cvsignore
index 2315169..473bf56 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-xforms-1.0.93pre7.tar.gz
-xforms-1.0.93pre7.tar.gz.sig
+xforms-1.0.93.tar.gz
+xforms-1.0.93.tar.gz.sig
diff --git a/sources b/sources
index 650d6d2..532463d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9e5317c49c233d3a4f9a59b86f7806c1 xforms-1.0.93pre7.tar.gz
-69df84af137bb7bb20a8276f9cee1066 xforms-1.0.93pre7.tar.gz.sig
+7d7c2b539ce4a6a5072204aa73fa9dc8 xforms-1.0.93.tar.gz
+f67c16b3d767d3a521eb3cc4afd6d4e7 xforms-1.0.93.tar.gz.sig
diff --git a/xforms.spec b/xforms.spec
index 977fff9..6d7a850 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -1,10 +1,8 @@
-%define pre pre7
-
Name: xforms
Summary: XForms toolkit library
Version: 1.0.93
-Release: 0.1.%{pre}%{?dist}
+Release: 1%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -100,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun May 23 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.0.93-1
+- xforms-1.0.93
+
* Tue May 18 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.0.93-0.1.pre7
- xforms-1.0.93pre7
- Requires: xorg-x11-fonts-ISO8859-1-75dpi
--
cgit v0.10.2
>From a9ea6bf96fb9cd66b3c26f78b0c165ed1e2b5adf Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 15:51:03 +0000
Subject: dist-git conversion
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 473bf56..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-xforms-1.0.93.tar.gz
-xforms-1.0.93.tar.gz.sig
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..473bf56
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+xforms-1.0.93.tar.gz
+xforms-1.0.93.tar.gz.sig
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 444b49b..0000000
--- a/Makefile
+++ /dev/null
@@ -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 $$d/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/Root && { 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)
--
cgit v0.10.2
>From 0ec179d9f65837149fbde5f360114ed5d6e79080 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Mon, 7 Feb 2011 23:03:22 -0600
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/xforms.spec b/xforms.spec
index 6d7a850..4b172fa 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -2,7 +2,7 @@
Name: xforms
Summary: XForms toolkit library
Version: 1.0.93
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.93-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Sun May 23 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.0.93-1
- xforms-1.0.93
--
cgit v0.10.2
>From 56ec9caba080451538a38b66540db6d6383b2000 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Mon, 15 Aug 2011 07:56:37 -0500
Subject: 1.0.94pre5
diff --git a/.gitignore b/.gitignore
index 473bf56..841ba1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
-xforms-1.0.93.tar.gz
-xforms-1.0.93.tar.gz.sig
+/xforms-1.0.93.tar.gz
+/xforms-1.0.93.tar.gz.sig
+/xforms-1.0.94pre5.tar.gz
+/xforms-1.0.94pre5.tar.gz.sig
diff --git a/sources b/sources
index 532463d..bbccdaa 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-7d7c2b539ce4a6a5072204aa73fa9dc8 xforms-1.0.93.tar.gz
-f67c16b3d767d3a521eb3cc4afd6d4e7 xforms-1.0.93.tar.gz.sig
+9787c05a91d0fe7eaff8e318826ff36c xforms-1.0.94pre5.tar.gz
+cd0b11c9625de1e7ff60ae5ec9977886 xforms-1.0.94pre5.tar.gz.sig
diff --git a/xforms.spec b/xforms.spec
index 4b172fa..b56c361 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -1,8 +1,10 @@
+%define pre pre5
+
Name: xforms
Summary: XForms toolkit library
-Version: 1.0.93
-Release: 2%{?dist}
+Version: 1.0.94
+Release: 0.1.%{pre}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -98,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Aug 15 2011 Rex Dieter <rdieter at fedoraproject.org> 1.0.94-0.1.pre5
+- 1.0.94pre5
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.93-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
--
cgit v0.10.2
>From 6868223ab7a0567a4e50be7e25b5a192c80a4a61 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Sat, 14 Jan 2012 02:55:26 -0600
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/xforms.spec b/xforms.spec
index b56c361..3b072cc 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -4,7 +4,7 @@
Name: xforms
Summary: XForms toolkit library
Version: 1.0.94
-Release: 0.1.%{pre}%{?dist}
+Release: 0.2.%{pre}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.94-0.2.pre5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
* Mon Aug 15 2011 Rex Dieter <rdieter at fedoraproject.org> 1.0.94-0.1.pre5
- 1.0.94pre5
--
cgit v0.10.2
>From 2b5dbeff69d2680ec57bae384a4d111e61a34596 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Tue, 15 May 2012 12:40:27 -0500
Subject: xforms-1.9.94pre11
diff --git a/.gitignore b/.gitignore
index 841ba1f..f5bd310 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
/xforms-1.0.93.tar.gz.sig
/xforms-1.0.94pre5.tar.gz
/xforms-1.0.94pre5.tar.gz.sig
+/xforms-1.0.94pre11.tar.gz
+/xforms-1.0.94pre11.tar.gz.sig
diff --git a/sources b/sources
index bbccdaa..9223df6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9787c05a91d0fe7eaff8e318826ff36c xforms-1.0.94pre5.tar.gz
-cd0b11c9625de1e7ff60ae5ec9977886 xforms-1.0.94pre5.tar.gz.sig
+c63746b0ed004dd0ac23a0690f6418d2 xforms-1.0.94pre11.tar.gz
+153b0860deaa5c040f255d072c63b0e3 xforms-1.0.94pre11.tar.gz.sig
diff --git a/xforms.spec b/xforms.spec
index 3b072cc..df9162a 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -1,10 +1,10 @@
-%define pre pre5
+%define pre pre11
Name: xforms
Summary: XForms toolkit library
Version: 1.0.94
-Release: 0.2.%{pre}%{?dist}
+Release: 0.3.%{pre}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue May 15 2012 Rex Dieter <rdieter at fedoraproject.org> 1.0.94-0.3.pre11
+- xforms-1.9.94pre11
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.94-0.2.pre5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
--
cgit v0.10.2
>From 0ba6dc144641f52cfe0c781474703ee95525b837 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri, 6 Jul 2012 10:29:13 -0500
Subject: xforms-1.9.94pre12
diff --git a/.gitignore b/.gitignore
index f5bd310..23aaae3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@
/xforms-1.0.93.tar.gz.sig
/xforms-1.0.94pre5.tar.gz
/xforms-1.0.94pre5.tar.gz.sig
-/xforms-1.0.94pre11.tar.gz
-/xforms-1.0.94pre11.tar.gz.sig
+/xforms-1.0.94pre12.tar.gz
+/xforms-1.0.94pre12.tar.gz.sig
diff --git a/sources b/sources
index 9223df6..dc739de 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-c63746b0ed004dd0ac23a0690f6418d2 xforms-1.0.94pre11.tar.gz
-153b0860deaa5c040f255d072c63b0e3 xforms-1.0.94pre11.tar.gz.sig
+5e81c5b48d57bfad83c061fdabcc7f83 xforms-1.0.94pre12.tar.gz
+abe3b3943419f8788d25c00f26d325a7 xforms-1.0.94pre12.tar.gz.sig
diff --git a/xforms.spec b/xforms.spec
index df9162a..afc7ecf 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -1,10 +1,10 @@
-%define pre pre11
+%define pre pre12
Name: xforms
Summary: XForms toolkit library
Version: 1.0.94
-Release: 0.3.%{pre}%{?dist}
+Release: 0.4.%{pre}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jul 06 2012 Rex Dieter <rdieter at fedoraproject.org> 1.0.94-0.4.pre12
+- xforms-1.9.94pre12
+
* Tue May 15 2012 Rex Dieter <rdieter at fedoraproject.org> 1.0.94-0.3.pre11
- xforms-1.9.94pre11
--
cgit v0.10.2
>From a3851ffb3713260f39603690f5f297cbadac3a14 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Sun, 22 Jul 2012 00:27:50 -0500
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/xforms.spec b/xforms.spec
index afc7ecf..396fbd0 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -4,7 +4,7 @@
Name: xforms
Summary: XForms toolkit library
Version: 1.0.94
-Release: 0.4.%{pre}%{?dist}
+Release: 0.5.%{pre}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.94-0.5.pre12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
* Fri Jul 06 2012 Rex Dieter <rdieter at fedoraproject.org> 1.0.94-0.4.pre12
- xforms-1.9.94pre12
--
cgit v0.10.2
>From 7b55462522547aa68a3975fc570b0ee18890312e Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac at redhat.com>
Date: Fri, 21 Dec 2012 20:41:31 +0100
Subject: rebuild against new libjpeg
Signed-off-by: Adam Tkac <atkac at redhat.com>
diff --git a/xforms.spec b/xforms.spec
index 396fbd0..1ef1265 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -4,7 +4,7 @@
Name: xforms
Summary: XForms toolkit library
Version: 1.0.94
-Release: 0.5.%{pre}%{?dist}
+Release: 0.6.%{pre}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.0.94-0.6.pre12
+- rebuild against new libjpeg
+
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.94-0.5.pre12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
--
cgit v0.10.2
>From 08fe1fa4a2936b8fcd0c1bff445f313ab628e516 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 4 Jan 2013 13:30:24 -0600
Subject: 1.9.94pre17
diff --git a/.gitignore b/.gitignore
index 23aaae3..ad1ee9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
/xforms-1.0.94pre5.tar.gz.sig
/xforms-1.0.94pre12.tar.gz
/xforms-1.0.94pre12.tar.gz.sig
+/xforms-1.0.94pre17.tar.gz
+/xforms-1.0.94pre17.tar.gz.sig
diff --git a/sources b/sources
index dc739de..dfefdb3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-5e81c5b48d57bfad83c061fdabcc7f83 xforms-1.0.94pre12.tar.gz
-abe3b3943419f8788d25c00f26d325a7 xforms-1.0.94pre12.tar.gz.sig
+1b934e4bb561f3b84933c8d3df5281cb xforms-1.0.94pre17.tar.gz
+a2aaf620e6d97552bec8e1303587242c xforms-1.0.94pre17.tar.gz.sig
diff --git a/xforms.spec b/xforms.spec
index 1ef1265..3f71c1e 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -1,10 +1,10 @@
-%define pre pre12
+%define pre pre17
Name: xforms
Summary: XForms toolkit library
Version: 1.0.94
-Release: 0.6.%{pre}%{?dist}
+Release: 0.7.%{pre}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jan 04 2013 Rex Dieter <rdieter at fedoraproject.org> 1.0.94-0.7.pre17
+- 1.9.94pre17
+
* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.0.94-0.6.pre12
- rebuild against new libjpeg
--
cgit v0.10.2
>From 3505211d475d754ad52148b5e8a419f030f738e9 Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac at redhat.com>
Date: Mon, 21 Jan 2013 18:05:56 +0100
Subject: Rebuild due to "jpeg8-ABI" feature drop
Signed-off-by: Adam Tkac <atkac at redhat.com>
diff --git a/xforms.spec b/xforms.spec
index 3f71c1e..77189f4 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -4,7 +4,7 @@
Name: xforms
Summary: XForms toolkit library
Version: 1.0.94
-Release: 0.7.%{pre}%{?dist}
+Release: 0.8.%{pre}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.0.94-0.8.pre17
+- rebuild due to "jpeg8-ABI" feature drop
+
* Fri Jan 04 2013 Rex Dieter <rdieter at fedoraproject.org> 1.0.94-0.7.pre17
- 1.9.94pre17
--
cgit v0.10.2
>From 1d61ce2d42909d16ccfed3a3e70673ae2f09b36c Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Thu, 14 Feb 2013 21:42:52 -0600
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/xforms.spec b/xforms.spec
index 77189f4..fcc05aa 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -4,7 +4,7 @@
Name: xforms
Summary: XForms toolkit library
Version: 1.0.94
-Release: 0.8.%{pre}%{?dist}
+Release: 0.9.%{pre}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.94-0.9.pre17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.0.94-0.8.pre17
- rebuild due to "jpeg8-ABI" feature drop
--
cgit v0.10.2
>From 6ad08ce6065af3b969ffbe845c3b01fd6c51b0ab Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Sun, 4 Aug 2013 03:13:03 -0500
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/xforms.spec b/xforms.spec
index fcc05aa..1e34906 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -4,7 +4,7 @@
Name: xforms
Summary: XForms toolkit library
Version: 1.0.94
-Release: 0.9.%{pre}%{?dist}
+Release: 0.10.%{pre}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.94-0.10.pre17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.94-0.9.pre17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
--
cgit v0.10.2
>From f77bb24b0bf02c7e88e76e6485e4c2c8e41bd382 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 14 Jan 2014 19:22:04 -0600
Subject: Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/.gitignore b/.gitignore
index ad1ee9b..8420236 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,2 @@
-/xforms-1.0.93.tar.gz
-/xforms-1.0.93.tar.gz.sig
-/xforms-1.0.94pre5.tar.gz
-/xforms-1.0.94pre5.tar.gz.sig
-/xforms-1.0.94pre12.tar.gz
-/xforms-1.0.94pre12.tar.gz.sig
-/xforms-1.0.94pre17.tar.gz
-/xforms-1.0.94pre17.tar.gz.sig
+/xforms-1.2.2.tar.gz
+/xforms-1.2.2.tar.gz.sig
diff --git a/sources b/sources
index dfefdb3..c88c6a8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-1b934e4bb561f3b84933c8d3df5281cb xforms-1.0.94pre17.tar.gz
-a2aaf620e6d97552bec8e1303587242c xforms-1.0.94pre17.tar.gz.sig
+4d45cb038e5d1e4cfd8a346ad072df4b xforms-1.2.2.tar.gz
+1ddacf1db4af9b831056866e7bb314e8 xforms-1.2.2.tar.gz.sig
diff --git a/xforms.spec b/xforms.spec
index 1e34906..44833ae 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -1,10 +1,8 @@
-%define pre pre17
-
Name: xforms
Summary: XForms toolkit library
-Version: 1.0.94
-Release: 0.10.%{pre}%{?dist}
+Version: 1.2.2
+Release: 1%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -84,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc COPYING.LIB Copyright ChangeLog NEWS README
+%doc COPYING.LIB Copyright ChangeLog
%{_libdir}/libflimage.so.2*
%{_libdir}/libformsGL.so.2*
%{_libdir}/libforms.so.2*
--
cgit v0.10.2
>From 45342ce8a5199747681c163af641963845d90db6 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 14 Jan 2014 19:25:21 -0600
Subject: awol changelog added
diff --git a/xforms.spec b/xforms.spec
index 44833ae..f50873b 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jan 14 2014 Rex Dieter <rdieter at fedoraproject.org> 1.2.2-1
+- 1.2.2
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.94-0.10.pre17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
--
cgit v0.10.2
>From 4b83aee8757e342ac4ea9c48fb12aa0c21122567 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Wed, 15 Jan 2014 09:53:39 -0600
Subject: 1.2.3
diff --git a/.gitignore b/.gitignore
index 8420236..7e3fe41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/xforms-1.2.2.tar.gz
-/xforms-1.2.2.tar.gz.sig
+/xforms-1.2.3.tar.gz
+/xforms-1.2.3.tar.gz.sig
diff --git a/sources b/sources
index c88c6a8..0ab8975 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-4d45cb038e5d1e4cfd8a346ad072df4b xforms-1.2.2.tar.gz
-1ddacf1db4af9b831056866e7bb314e8 xforms-1.2.2.tar.gz.sig
+235720a758a8b8d9e6e452dc67190e9b xforms-1.2.3.tar.gz
+507069d04c1a830aed496277a257ae0b xforms-1.2.3.tar.gz.sig
diff --git a/xforms.spec b/xforms.spec
index f50873b..8e35c8b 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -1,7 +1,7 @@
Name: xforms
Summary: XForms toolkit library
-Version: 1.2.2
+Version: 1.2.3
Release: 1%{?dist}
License: LGPLv2+
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jan 15 2014 Rex Dieter <rdieter at fedoraproject.org> 1.2.3-1
+- 1.2.3
+
* Tue Jan 14 2014 Rex Dieter <rdieter at fedoraproject.org> 1.2.2-1
- 1.2.2
--
cgit v0.10.2
>From 2f2a50f3fbf4d8df89e3afbb1c77c81aa155e5c6 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Sun, 8 Jun 2014 00:51:27 -0500
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/xforms.spec b/xforms.spec
index 8e35c8b..d5f420c 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -2,7 +2,7 @@
Name: xforms
Summary: XForms toolkit library
Version: 1.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
* Wed Jan 15 2014 Rex Dieter <rdieter at fedoraproject.org> 1.2.3-1
- 1.2.3
--
cgit v0.10.2
>From 28f1571e81c3aabf6149b834987275b2b617fcc7 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at fedoraproject.org>
Date: Mon, 18 Aug 2014 10:02:28 +0000
Subject: - Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/xforms.spec b/xforms.spec
index d5f420c..b3db529 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -2,7 +2,7 @@
Name: xforms
Summary: XForms toolkit library
Version: 1.2.3
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
--
cgit v0.10.2
>From 042609da078ae1e7d297c30b369b3fb13052b9f1 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert at fedoraproject.org>
Date: Wed, 8 Apr 2015 02:15:05 +0200
Subject: Upgrade to 1.2.4
diff --git a/.gitignore b/.gitignore
index 7e3fe41..192c861 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/xforms-1.2.3.tar.gz
-/xforms-1.2.3.tar.gz.sig
+/xforms-1.2.?.tar.gz
+/xforms-1.2.?.tar.gz.sig
diff --git a/sources b/sources
index 0ab8975..0c50c2a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-235720a758a8b8d9e6e452dc67190e9b xforms-1.2.3.tar.gz
-507069d04c1a830aed496277a257ae0b xforms-1.2.3.tar.gz.sig
+d4414c9eb3b284aa2f603a49f376ed22 xforms-1.2.4.tar.gz
+b16dfa7da68a467307295f647392d893 xforms-1.2.4.tar.gz.sig
diff --git a/xforms.spec b/xforms.spec
index b3db529..d8388b1 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -1,15 +1,12 @@
Name: xforms
Summary: XForms toolkit library
-Version: 1.2.3
-Release: 3%{?dist}
+Version: 1.2.4
+Release: 1%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
-#URL: http://www.nongnu.org/xforms/
URL: http://xforms-toolkit.org/
-#Source0: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz
-#Source1: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz.sig
Source0: http://download.savannah.gnu.org/releases-noredirect/xforms/xforms-%{version}%{?pre}.tar.gz
Source1: http://download.savannah.gnu.org/releases-noredirect/xforms/xforms-%{version}%{?pre}.tar.gz.sig
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -98,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Apr 08 2015 Robert Scheck <robert at fedoraproject.org> - 1.2.4-1
+- Upgrade to 1.2.4
+
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
--
cgit v0.10.2
>From d9639521e745799b9466866378c730679e23a07d Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert at fedoraproject.org>
Date: Wed, 8 Apr 2015 16:21:09 +0200
Subject: Some minor spec file tweaks
diff --git a/xforms.spec b/xforms.spec
index d8388b1..3ed0c04 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -1,8 +1,7 @@
-
Name: xforms
Summary: XForms toolkit library
Version: 1.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -25,21 +24,22 @@ Requires: netpbm-progs
# import eps,ps (optional?)
#Requires: ghostscript
# eww, http://lists.nongnu.org/archive/html/xforms-development/2010-05/msg00000.html
-Requires: xorg-x11-fonts-ISO8859-1-75dpi
+Requires: xorg-x11-fonts-ISO8859-1-75dpi xorg-x11-fonts-ISO8859-1-100dpi
%description
-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.
+XForms is a GUI toolkit based on Xlib for X Window Systems. It features a
+rich set of objects, such as buttons, sliders, browsers, 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.
%package devel
Summary: Development files for the XForms toolkit library
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{?x_deps}
+
%description devel
%{summary}.
@@ -62,7 +62,7 @@ make %{?_smp_mflags} X_PRE_LIBS=""
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
## Unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
@@ -79,7 +79,9 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc COPYING.LIB Copyright ChangeLog
+%{!?_licensedir:%global license %%doc}
+%license COPYING.LIB Copyright
+%doc ChangeLog README
%{_libdir}/libflimage.so.2*
%{_libdir}/libformsGL.so.2*
%{_libdir}/libforms.so.2*
@@ -95,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Apr 08 2015 Robert Scheck <robert at fedoraproject.org> - 1.2.4-2
+- Some minor spec file tweaks
+
* Wed Apr 08 2015 Robert Scheck <robert at fedoraproject.org> - 1.2.4-1
- Upgrade to 1.2.4
@@ -243,4 +248,3 @@ rm -rf $RPM_BUILD_ROOT
* Mon Jan 20 2003 Rex Dieter <rexdieter at sf.net> 1.0-0
- 1.0-release
- redhat-ize specfile
-
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/xforms.git/commit/?h=el5&id=eb22c06b0e63c9d02957a916149284386fd9c012
More information about the scm-commits
mailing list