diff --git a/fltk-1.3.4-1-source.tar.gz b/fltk-1.3.4-1-source.tar.gz deleted file mode 100644 index c2fabc0..0000000 Binary files a/fltk-1.3.4-1-source.tar.gz and /dev/null differ diff --git a/fltk-1.3.4-fltk_config.patch b/fltk-1.3.4-fltk_config.patch deleted file mode 100644 index 5f33a0f..0000000 --- a/fltk-1.3.4-fltk_config.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -up fltk-1.3.4-1/fltk-config.in.fltk_config fltk-1.3.4-1/fltk-config.in ---- fltk-1.3.4-1/fltk-config.in.fltk_config 2016-01-30 20:49:56.000000000 -0600 -+++ fltk-1.3.4-1/fltk-config.in 2017-03-04 12:29:28.910316677 -0600 -@@ -44,8 +44,8 @@ CXX="@CXX@" - - # flags for C++ compiler: - ARCHFLAGS="@ARCHFLAGS@" --CFLAGS="@CFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@" --CXXFLAGS="@CXXFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@" -+CFLAGS="" -+CXXFLAGS="" - LDFLAGS="@LDFLAGS@" - LDLIBS="@LIBS@" - OPTIM="@OPTIM@" -@@ -228,7 +228,7 @@ if test "$BINARY_DIR" != ""; then - includes="-I$BINARY_DIR $includes" - fi - --if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32; then -+if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32 -a "$libdir" != /usr/lib64; then - libs=-L$libdir - else - libs= -@@ -236,28 +236,28 @@ fi - - # Calculate needed libraries - LDSTATIC="$libdir/libfltk.a $LDLIBS" --LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS" -+LDLIBS="-lfltk$SHAREDSUFFIX" - - if test x$use_forms = xyes; then - LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS" - LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC" - fi - if test x$use_gl = xyes; then -- LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS" -+ LDLIBS="-lfltk_gl$SHAREDSUFFIX $LDLIBS" - LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC" - fi - if test x$use_images = xyes; then -- LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS" -+ LDLIBS="-lfltk_images$SHAREDSUFFIX $LDLIBS" - LDSTATIC="$libdir/libfltk_images.a $STATICIMAGELIBS $LDSTATIC" - fi - - if test x$use_cairo = xyes; then -- LDLIBS="-lfltk_cairo$SHAREDSUFFIX $CAIROLIBS $LDLIBS" -+ LDLIBS="-lfltk_cairo$SHAREDSUFFIX $LDLIBS" - LDSTATIC="$libdir/libfltk_cairo.a $CAIROLIBS $LDSTATIC" - fi - --LDLIBS="$DSOLINK $LDFLAGS $libs $LDLIBS" --LDSTATIC="$LDFLAGS $LDSTATIC" -+LDLIBS="$libs $LDLIBS" -+#LDSTATIC="$LDFLAGS $LDSTATIC" - - # Answer to user requests - if test -n "$echo_help"; then diff --git a/fltk-1.3.5-source.tar.gz b/fltk-1.3.5-source.tar.gz new file mode 100644 index 0000000..5483aa0 Binary files /dev/null and b/fltk-1.3.5-source.tar.gz differ diff --git a/fltk.spec b/fltk.spec index 98abc6b..b869c91 100644 --- a/fltk.spec +++ b/fltk.spec @@ -1,19 +1,16 @@ %global _changelog_trimtime %(date +%s -d "1 year ago") Name: fltk -Version: 1.3.4 -Release: 9 +Version: 1.3.5 +Release: 1 Summary: C++ user interface toolkit License: LGPLv2+ with exceptions URL: http://www.fltk.org/ -Source0: http://fltk.org/pub/fltk/1.3.4/fltk-1.3.4-1-source.tar.gz +Source0: https://www.fltk.org/pub/fltk/1.3.5/fltk-1.3.5-source.tar.gz Source1: fltk-config.sh -#PATCH-FIX-https://bugzilla.redhat.com/ -Patch0001: fltk-1.3.4-fltk_config.patch -#PATCH-FIX-https://bugzilla.redhat.com/ -Patch0002: fltk-1.3.4-x-fluid_mimetype.patch +Patch0001: fltk-1.3.4-x-fluid_mimetype.patch Provides: %{name}-fluid = %{version}-%{release} Obsoletes: %{name}-fluid < %{version}-%{release} @@ -43,7 +40,7 @@ currently maintained by a small group of developers across the world with a cent %package_help %prep -%autosetup -n %{name}-%{version}-1 -p1 +%autosetup -n %{name}-%{version} -p1 sed -i.silent '\,^.SILENT:,d' makeinclude.in autoconf @@ -116,6 +113,12 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop %{_mandir}/man1/fluid.1* %changelog +* Sat Jan 11 2020 openEuler Buildteam - 1.3.5-1 +- Type:enhancement +- Id:NA +- SUG:NA +- DESC:update version to 1.3.5 + * Thu Oct 31 2019 openEuler Buildteam - 1.3.4-9 - Type:bugfix - Id:NA