From 61aaaffe21be60d41f61a9123ec10752a25fb9b3 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Wed, 10 Apr 2019 06:48:49 +0200 Subject: [PATCH] - updated to 1.3.5 - updated as-needed,link patches - removed obsolete libjpeg patch - added mime patch (update MIME data installation) - /usr/share/doc/fltk symlink replaced by docdir patch - split -apidocs and -fluid from -devel --- fltk-as-needed.patch | 32 +++++++-------- fltk-docdir.patch | 11 ++++++ fltk-libjpeg.patch | 21 ---------- fltk-link.patch | 18 ++++----- fltk-mime.patch | 13 +++++++ fltk.spec | 93 +++++++++++++++++++++++++++++++++----------- 6 files changed, 119 insertions(+), 69 deletions(-) create mode 100644 fltk-docdir.patch delete mode 100644 fltk-libjpeg.patch create mode 100644 fltk-mime.patch diff --git a/fltk-as-needed.patch b/fltk-as-needed.patch index 3b18eb6..91e73f8 100644 --- a/fltk-as-needed.patch +++ b/fltk-as-needed.patch @@ -1,14 +1,14 @@ ---- fltk-1.3.3/configure.in.orig 2014-11-18 22:26:21.621181598 +0100 -+++ fltk-1.3.3/configure.in 2014-11-19 16:58:39.211714220 +0100 -@@ -250,7 +250,7 @@ - GLDSONAME="libfltk_gl.so.$FL_API_VERSION" - IMGDSONAME="libfltk_images.so.$FL_API_VERSION" - CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION" -- DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o" -+ DSOCOMMAND="\$(CXX) \$(DSOFLAGS) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o" +--- fltk-1.3.5/configure.ac.orig 2019-04-09 19:15:01.127591888 +0200 ++++ fltk-1.3.5/configure.ac 2019-04-09 19:18:55.769654056 +0200 +@@ -274,7 +274,7 @@ + GLDSONAME="libfltk_gl.so.$FL_DSO_VERSION" + IMGDSONAME="libfltk_images.so.$FL_DSO_VERSION" + CAIRODSONAME="libfltk_cairo.so.$FL_DSO_VERSION" +- DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o" ++ DSOCOMMAND="\$(CXX) \$(DSOFLAGS) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o" - # See if the compiler supports -fvisibility... - AC_CACHE_CHECK([if the compiler supports -fvisibility], + # See if the compiler supports -fvisibility... + AC_CACHE_CHECK([if the compiler supports -fvisibility], --- fltk-1.3.3/src/Makefile.orig 2014-10-30 17:05:22.000000000 +0100 +++ fltk-1.3.3/src/Makefile 2014-11-18 22:26:21.624514932 +0100 @@ -258,7 +258,7 @@ @@ -47,14 +47,14 @@ echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o $(RM) $@ $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o ---- fltk-1.3.3/cairo/Makefile.orig 2014-10-05 02:03:27.000000000 +0200 -+++ fltk-1.3.3/cairo/Makefile 2014-11-19 21:29:49.911031382 +0100 -@@ -39,7 +39,7 @@ +--- fltk-1.3.5/cairo/Makefile.orig 2019-04-09 19:15:01.130925203 +0200 ++++ fltk-1.3.5/cairo/Makefile 2019-04-09 19:19:17.109538448 +0200 +@@ -42,7 +42,7 @@ - libfltk_cairo.so.1.3: $(CAIROOBJECTS) ../src/libfltk.so.1.3 + libfltk_cairo.so.$(FL_DSO_VERSION): $(CAIROOBJECTS) ../src/libfltk.so.$(FL_DSO_VERSION) echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk -+ $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk -lcairo +- $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS) ++ $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS) -lcairo $(RM) libfltk_cairo.so $(LN) $(CAIRODSONAME) libfltk_cairo.so diff --git a/fltk-docdir.patch b/fltk-docdir.patch new file mode 100644 index 0000000..3a57199 --- /dev/null +++ b/fltk-docdir.patch @@ -0,0 +1,11 @@ +--- fltk-1.3.5/configure.ac.orig 2019-04-10 06:14:17.019965891 +0200 ++++ fltk-1.3.5/configure.ac 2019-04-10 06:29:12.975112086 +0200 +@@ -1470,7 +1470,7 @@ + if test x$prefix = xNONE; then + AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "/usr/local/share/doc/fltk") + else +- AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "$prefix/share/doc/fltk") ++ AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "$prefix/share/doc/fltk-apidocs-$FL_VERSION") + fi + ;; + esac diff --git a/fltk-libjpeg.patch b/fltk-libjpeg.patch deleted file mode 100644 index bb2d2a2..0000000 --- a/fltk-libjpeg.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur fltk-1.3.2.orig/src/Fl_JPEG_Image.cxx fltk-1.3.2/src/Fl_JPEG_Image.cxx ---- fltk-1.3.2.orig/src/Fl_JPEG_Image.cxx 2012-11-09 16:02:08.000000000 +0000 -+++ fltk-1.3.2/src/Fl_JPEG_Image.cxx 2013-05-06 10:51:18.248634358 +0000 -@@ -155,7 +155,7 @@ - - jpeg_create_decompress(&dinfo); - jpeg_stdio_src(&dinfo, fp); -- jpeg_read_header(&dinfo, 1); -+ jpeg_read_header(&dinfo, TRUE); - - dinfo.quantize_colors = (boolean)FALSE; - dinfo.out_color_space = JCS_RGB; -@@ -333,7 +333,7 @@ - - jpeg_create_decompress(&dinfo); - jpeg_mem_src(&dinfo, data); -- jpeg_read_header(&dinfo, 1); -+ jpeg_read_header(&dinfo, TRUE); - - dinfo.quantize_colors = (boolean)FALSE; - dinfo.out_color_space = JCS_RGB; diff --git a/fltk-link.patch b/fltk-link.patch index 42ce759..0489213 100644 --- a/fltk-link.patch +++ b/fltk-link.patch @@ -1,4 +1,4 @@ --- fltk-1.1.8/makeinclude.in~ 2008-03-28 22:31:50.280354265 +0100 +--- fltk-1.1.8/makeinclude.in~ 2008-03-28 22:31:50.280354265 +0100 +++ fltk-1.1.8/makeinclude.in 2008-03-28 22:31:55.920623903 +0100 @@ -127,7 +127,7 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@ @@ -9,8 +9,8 @@ # Build commands and filename extensions... .SUFFIXES: .0 .1 .3 .6 .c .cxx .h .fl .man .o .z $(EXEEXT) ---- fltk-1.3.0/configure.in.orig 2011-12-11 18:23:15.000000000 +0100 -+++ fltk-1.3.0/configure.in 2011-12-11 18:30:07.000000000 +0100 +--- fltk-1.3.5/configure.ac.orig 2011-12-11 18:23:15.000000000 +0100 ++++ fltk-1.3.5/configure.ac 2011-12-11 18:30:07.000000000 +0100 @@ -335,7 +335,7 @@ ;; esac @@ -20,9 +20,9 @@ else DSOCOMMAND="echo" DSOLINK="" ---- fltk-1.3.0/src/Makefile.orig 2011-12-11 18:23:16.000000000 +0100 -+++ fltk-1.3.0/src/Makefile 2011-12-11 18:36:24.000000000 +0100 -@@ -557,7 +557,10 @@ +--- fltk-1.3.5/src/Makefile.orig 2019-04-09 19:21:49.552045930 +0200 ++++ fltk-1.3.5/src/Makefile 2019-04-09 19:26:33.250509003 +0200 +@@ -556,7 +556,10 @@ install: $(LIBNAME) $(DSONAME) \ $(FLLIBNAME) $(FLDSONAME) \ $(GLLIBNAME) $(GLDSONAME) \ @@ -34,7 +34,7 @@ echo "Installing libraries in $(DESTDIR)$(libdir)..." -$(INSTALL_DIR) $(DESTDIR)$(libdir) -$(INSTALL_DIR) $(DESTDIR)$(bindir) -@@ -565,13 +568,10 @@ +@@ -564,13 +567,10 @@ $(INSTALL_LIB) $(LIBNAME) $(DESTDIR)$(libdir) $(INSTALL_LIB) $(FLLIBNAME) $(DESTDIR)$(libdir) $(INSTALL_LIB) $(IMGLIBNAME) $(DESTDIR)$(libdir) @@ -46,6 +46,6 @@ - $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \ fi - $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME) - if test x$(DSONAME) = xlibfltk.so.1.3; then\ + if test x$(DSONAME) = xlibfltk.so.$(FL_DSO_VERSION); then\ $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\ - $(INSTALL_LIB) libfltk.so.1.3 $(DESTDIR)$(libdir); \ + $(INSTALL_LIB) libfltk.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \ diff --git a/fltk-mime.patch b/fltk-mime.patch new file mode 100644 index 0000000..d6cb863 --- /dev/null +++ b/fltk-mime.patch @@ -0,0 +1,13 @@ +--- fltk-1.3.5/fluid/Makefile.orig 2019-03-03 09:40:23.000000000 +0100 ++++ fltk-1.3.5/fluid/Makefile 2019-04-10 06:08:07.201969367 +0200 +@@ -85,8 +85,8 @@ + fi; \ + $(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_DIR) $(DESTDIR)/usr/share/mime/packages ++ $(INSTALL_DATA) fluid.xml $(DESTDIR)/usr/share/mime/packages + + install-osx: + echo Installing Fluid in $(DESTDIR)/Applications... diff --git a/fltk.spec b/fltk.spec index ff583a9..7f0dbfb 100644 --- a/fltk.spec +++ b/fltk.spec @@ -7,17 +7,19 @@ Summary: Fast Light Tool Kit Summary(pl.UTF-8): FLTK - "lekki" X11 toolkit Summary(pt_BR.UTF-8): Interface gráfica em C++ para X, OpenGL e Windows Name: fltk -Version: 1.3.3 -Release: 2 +Version: 1.3.5 +Release: 1 License: LGPL v2 with amendments (see COPYING) Group: X11/Libraries -Source0: http://fltk.org/pub/fltk/%{version}/%{name}-%{version}-source.tar.gz -# Source0-md5: 9ccdb0d19dc104b87179bd9fd10822e3 +#Source0Download: https://www.fltk.org/software.php +Source0: https://www.fltk.org/pub/fltk/%{version}/%{name}-%{version}-source.tar.bz2 +# Source0-md5: 0de2b45a1896be2b4a8cafae89b84248 Patch0: %{name}-desktop.patch Patch1: %{name}-as-needed.patch Patch2: %{name}-link.patch -Patch3: %{name}-libjpeg.patch +Patch3: %{name}-mime.patch Patch4: %{name}-export.patch +Patch5: %{name}-docdir.patch URL: http://www.fltk.org/ %{?with_opengl:BuildRequires: OpenGL-GLU-devel} %{?with_opengl:BuildRequires: OpenGL-GLX-devel} @@ -178,6 +180,32 @@ FLTK GL static library. %description gl-static -l pl.UTF-8 Statyczna biblioteka FLTK GL. +%package apidocs +Summary: API documentation for FLTK library +Summary(pl.UTF-8): Dokumentacja API biblioteki FLTK +Group: Documentation + +%description apidocs +API documentation for FLTK library. + +%description apidocs -l pl.UTF-8 +Dokumentacja API biblioteki FLTK. + +%package fluid +Summary: FLTK GUI Designer +Summary(pl.UTF-8): Narzędzie FLTK do projektowania GUI +Group: X11/Development/Tools +Requires(post,postun): desktop-file-utils +Requires(post,postun): shared-mime-info +Requires: %{name} = %{version}-%{release} +Suggests: %{name}-apidocs = %{version}-%{release} + +%description fluid +FLTK GUI Designer. + +%description fluid -l pl.UTF-8 +Narzędzie FLTK do projektowania GUI. + %package games Summary: FLTK Games Summary(pl.UTF-8): Gry FLTK @@ -197,6 +225,7 @@ Gry FLTK: Atak Klocków!, Warcaby, Sudoku. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build # gold doesn't understand -l:path/to/library.so @@ -218,14 +247,13 @@ fi %{?with_xft:--enable-xft} %{__make} -cd documentation -%{__make} html + +%{__make} -C documentation html %install rm -rf $RPM_BUILD_ROOT -%{__make} install \ - install-desktop \ +%{__make} install install-desktop \ DESTDIR=$RPM_BUILD_ROOT # less generic games' names @@ -237,9 +265,8 @@ done # we package mans in groff format %{__rm} -r $RPM_BUILD_ROOT%{_mandir}/cat? -# add link to documentation for fluid help; remove /usr/share/doc/fltk contents - it is installed during make install +# packaged as %doc %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/doc/%{name} -ln -sf %{name}-devel-%{version} $RPM_BUILD_ROOT%{_datadir}/doc/%{name} %clean rm -rf $RPM_BUILD_ROOT @@ -253,20 +280,33 @@ rm -rf $RPM_BUILD_ROOT %post gl -p /sbin/ldconfig %postun gl -p /sbin/ldconfig +%post fluid +%update_icon_cache hicolor +%update_desktop_database +%update_mime_database + +%postun fluid +%update_icon_cache hicolor +%update_desktop_database +%update_mime_database + +%post games +%update_icon_cache hicolor + +%postun games +%update_icon_cache hicolor + %files %defattr(644,root,root,755) # note: COPYING contains amendments to LGPL, so don't remove! -%doc CHANGES COPYING CREDITS README +%doc ANNOUNCEMENT CHANGES COPYING CREDITS README %attr(755,root,root) %{_libdir}/libfltk.so.*.* %attr(755,root,root) %{_libdir}/libfltk_forms.so.*.* %attr(755,root,root) %{_libdir}/libfltk_images.so.*.* %files devel %defattr(644,root,root,755) -%doc documentation/html/*.{html,jpg,png} -%doc %{_datadir}/doc/%{name} %attr(755,root,root) %{_bindir}/fltk-config -%attr(755,root,root) %{_bindir}/fluid %attr(755,root,root) %{_libdir}/libfltk.so %attr(755,root,root) %{_libdir}/libfltk_forms.so %attr(755,root,root) %{_libdir}/libfltk_images.so @@ -274,12 +314,7 @@ rm -rf $RPM_BUILD_ROOT %exclude %{_includedir}/FL/Fl_Cairo*.H %exclude %{_includedir}/FL/Fl_Gl_Window.H %exclude %{_includedir}/FL/gl* -%{_iconsdir}/hicolor/*/apps/fluid.png -%{_desktopdir}/fluid.desktop -# move to some KDE package? -#%{_datadir}/mimelnk/application/x-fluid.desktop %{_mandir}/man1/fltk-config.1* -%{_mandir}/man1/fluid.1* %{_mandir}/man3/fltk.3* %files static @@ -317,14 +352,26 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libfltk_gl.a %endif +%files apidocs +%defattr(644,root,root,755) +%doc documentation/html/*.{html,jpg,png} + +%files fluid +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/fluid +%{_iconsdir}/hicolor/*x*/apps/fluid.png +%{_desktopdir}/fluid.desktop +%{_datadir}/mime/packages/fluid.xml +%{_mandir}/man1/fluid.1* + %files games %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/%{name}-blocks %attr(755,root,root) %{_bindir}/%{name}-checkers %attr(755,root,root) %{_bindir}/%{name}-sudoku -%{_iconsdir}/hicolor/*/apps/blocks.png -%{_iconsdir}/hicolor/*/apps/checkers.png -%{_iconsdir}/hicolor/*/apps/sudoku.png +%{_iconsdir}/hicolor/*x*/apps/blocks.png +%{_iconsdir}/hicolor/*x*/apps/checkers.png +%{_iconsdir}/hicolor/*x*/apps/sudoku.png %{_desktopdir}/blocks.desktop %{_desktopdir}/checkers.desktop %{_desktopdir}/sudoku.desktop -- 2.44.0