diff --git a/fltk-1.3.4-x-fluid_mimetype.patch b/fltk-1.3.4-x-fluid_mimetype.patch deleted file mode 100644 index fe7f09a65f9bf4c3e5826bfb8c3fed01c0fc281f..0000000000000000000000000000000000000000 --- a/fltk-1.3.4-x-fluid_mimetype.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up fltk-1.3.4-1/fluid/Makefile.x-fluid_mimetype fltk-1.3.4-1/fluid/Makefile ---- fltk-1.3.4-1/fluid/Makefile.x-fluid_mimetype 2016-07-17 14:51:54.000000000 -0500 -+++ fltk-1.3.4-1/fluid/Makefile 2017-03-04 12:42:00.573346286 -0600 -@@ -84,7 +84,7 @@ install-linux: - $(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/fluid.png; \ - done - -$(INSTALL_DIR) $(DESTDIR)/usr/share/mimelnk/application -- $(INSTALL_DATA) x-fluid.desktop $(DESTDIR)/usr/share/mimelnk/application -+ #$(INSTALL_DATA) x-fluid.desktop $(DESTDIR)/usr/share/mimelnk/application - - install-osx: - echo Installing Fluid in $(DESTDIR)/Applications... -@@ -104,7 +104,7 @@ uninstall: - uninstall-linux: - $(RM) $(DESTDIR)/usr/share/applications/fluid.desktop - $(RM) $(DESTDIR)/usr/share/icons/hicolor/*/fluid.png -- $(RM) $(DESTDIR)/usr/share/mimelnk/application/x-fluid.desktop -+ #$(RM) $(DESTDIR)/usr/share/mimelnk/application/x-fluid.desktop - - uninstall-osx: - $(RM) -r $(DESTDIR)/Applications/fluid.app diff --git a/fltk-1.3.9-source.tar.gz b/fltk-1.4.0-source.tar.gz similarity index 37% rename from fltk-1.3.9-source.tar.gz rename to fltk-1.4.0-source.tar.gz index 73aa0ee4d16f117591248a058941ed33a1a48241..457d44a4305e4f01d46944b8b1303be50895e2f8 100644 Binary files a/fltk-1.3.9-source.tar.gz and b/fltk-1.4.0-source.tar.gz differ diff --git a/fltk-1.4.0-x-fluid_mimetype.patch b/fltk-1.4.0-x-fluid_mimetype.patch new file mode 100644 index 0000000000000000000000000000000000000000..f94d242cb4938d00f10e1c72e9393b07a829a9eb --- /dev/null +++ b/fltk-1.4.0-x-fluid_mimetype.patch @@ -0,0 +1,21 @@ +diff -up fltk-1.4.0/fluid/Makefile.x-fluid_mimetype fltk-1.4.0/fluid/Makefile +--- fltk-1.4.0/fluid/Makefile.x-fluid_mimetype 2024-11-26 11:08:59.109704917 +0800 ++++ fltk-1.4.0/fluid/Makefile 2024-11-26 11:09:27.367704917 +0800 +@@ -110,7 +110,7 @@ install-linux: + $(INSTALL_DATA) icons/fluid-$$size.png "$(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/fluid.png"; \ + done + -$(INSTALL_DIR) "$(DESTDIR)$(datadir)/mimelnk/application" +- $(INSTALL_DATA) x-fluid.desktop "$(DESTDIR)$(datadir)/mimelnk/application" ++ #$(INSTALL_DATA) x-fluid.desktop "$(DESTDIR)$(datadir)/mimelnk/application" + + install-osx: + echo Installing Fluid in $(DESTDIR)/Applications... +@@ -129,7 +129,7 @@ uninstall: + uninstall-linux: + $(RM) "$(DESTDIR)$(datadir)/applications/fluid.desktop" + $(RM) "$(DESTDIR)$(datadir)/icons/hicolor"/*/fluid.png +- $(RM) "$(DESTDIR)$(datadir)/mimelnk/application/x-fluid.desktop" ++ #$(RM) "$(DESTDIR)$(datadir)/mimelnk/application/x-fluid.desktop" + + uninstall-osx: + $(RM) -r "$(DESTDIR)/Applications/fluid.app" diff --git a/fltk.spec b/fltk.spec index f4af780bbc7af15318aa0aa6873f3da72e3f9681..0eda92aa3888f0f83ef98f94b82f40c4bc86abab 100644 --- a/fltk.spec +++ b/fltk.spec @@ -1,7 +1,7 @@ %global _changelog_trimtime %(date +%s -d "1 year ago") Name: fltk -Version: 1.3.9 +Version: 1.4.0 Release: 1 Summary: C++ user interface toolkit License: LGPLv2+ with exceptions @@ -11,7 +11,7 @@ Source0: https://www.fltk.org/pub/fltk/%{version}/%{name}-%{version}-sour Source1: fltk-config.sh -Patch0001: fltk-1.3.4-x-fluid_mimetype.patch +Patch0001: fltk-1.4.0-x-fluid_mimetype.patch BuildRequires: gcc-c++ desktop-file-utils libjpeg-devel pkgconfig(libpng) pkgconfig(gl) pkgconfig(glu) pkgconfig(ice) BuildRequires: pkgconfig(sm) pkgconfig(xext) pkgconfig(xinerama) pkgconfig(xft) pkgconfig(xt) pkgconfig(x11) @@ -107,6 +107,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop %files devel %defattr(-,root,root) %{_bindir}/fltk-config +%{_bindir}/fltk-options %{?arch:%{_bindir}/fltk-config-%{arch}} %{_libdir}/*.a %{_libdir}/*.so @@ -119,7 +120,8 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop %files help %defattr(-,root,root) -%doc README* ANNOUNCEMENT CHANGES* CREDITS __docs/* +%doc README* ANNOUNCEMENT CHANGES* __docs/* +%{_mandir}/man1/fltk-options.1* %{_mandir}/man1/fltk-config.1* %{_mandir}/man3/fltk.3* @@ -136,6 +138,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop %{_datadir}/icons/hicolor/*/*/* %changelog +* Tue Nov 26 2024 wangxiaomeng - 1.4.0-1 +- update to version 1.4.0 + * Fri Dec 29 2023 Paul Thomas - 1.3.9-1 - update to version 1.3.9