robert pushed to xforms (epel7). "- xforms-1.0.92pre7"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 8 14:25:58 UTC 2015
>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
http://pkgs.fedoraproject.org/cgit/xforms.git/commit/?h=epel7&id=5ec5d8b46cb1cae68a7349380e72851bbe7c0525
More information about the scm-commits
mailing list