Hello community, here is the log from the commit of package lazarus for openSUSE:Factory checked in at 2018-01-09 14:52:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lazarus (Old) and /work/SRC/openSUSE:Factory/.lazarus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lazarus" Tue Jan 9 14:52:34 2018 rev:3 rq:561724 version:1.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/lazarus/lazarus.changes 2017-05-08 19:04:08.086644896 +0200 +++ /work/SRC/openSUSE:Factory/.lazarus.new/lazarus.changes 2018-01-09 14:52:38.105372071 +0100 @@ -1,0 +2,35 @@ +Thu Jan 4 18:25:37 UTC 2018 - [email protected] + +- fix description fo libQt5Pas packages + +------------------------------------------------------------------- +Tue Dec 26 15:18:15 UTC 2017 - [email protected] + +- Remove bashsisms from %prep. Replace useless use of cat. + Fix unusual BuildRequires for sles>=11. + Trim filler wording from description. + +------------------------------------------------------------------- +Sun Dec 17 17:44:17 UTC 2017 - [email protected] + +- Actually install the LCL Qt5 interface + +------------------------------------------------------------------- +Sun Dec 17 16:52:39 UTC 2017 - [email protected] + +- add/download right/original source +- add missing %defattr(-,root,root,-) for new libQt5Pas and + libQt5Pas-devel files section +- rebase lazarus.desktop.patch + +------------------------------------------------------------------- +Wed Dec 6 20:02:01 UTC 2017 - [email protected] + +- Update to version 1.8.0, for a complete changelog see: + http://wiki.freepascal.org/Lazarus_1.8.0_release_notes + +- Refreshed lazarus.desktop.patch + +- Enabled Qt5 and built libQt5Pas for supported targets + +------------------------------------------------------------------- Old: ---- lazarus-1.6.2-0.tar.gz New: ---- lazarus-1.8.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lazarus.spec ++++++ --- /var/tmp/diff_new_pack.Z8vTit/_old 2018-01-09 14:52:40.713249810 +0100 +++ /var/tmp/diff_new_pack.Z8vTit/_new 2018-01-09 14:52:40.713249810 +0100 @@ -1,7 +1,7 @@ # # spec file for package lazarus # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,15 +16,16 @@ # +%define sover 1 Name: lazarus -Version: 1.6.2 +Version: 1.8.0 Release: 0 # Please note that the LGPL is modified and this is not multi-licensed, but each component has a separate license chosen. Summary: FreePascal RAD IDE and Component Library License: GPL-2.0 and LGPL-2.0 and MPL-1.1 Group: Development/Languages/Other Url: http://www.lazarus.freepascal.org/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-0.tar.gz +Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # PATCH-FEATURE-UPSTREAM http://mantis.freepascal.org/view.php?id=31364 Source1: https://raw.githubusercontent.com/hughsie/fedora-appstream/developerapps/appdata-extra/desktop/lazarus.appdata.xml Source90: %{name}-rpmlintrc @@ -44,17 +45,24 @@ %if 0%{?suse_version} >= 1140 BuildRequires: hicolor-icon-theme %endif -%if 0%{?sles_version} >= 11 +%if 0%{?sles_version} == 11 BuildRequires: glib2-devel BuildRequires: gtk2-devel %else BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-2.0) %endif +%if 0%{?sle_version} >= 120200 || 0%{?suse_version} > 1320 +BuildRequires: libqt5-qtbase-common-devel >= 5.6.0 +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5X11Extras) +%endif Requires: fpc Requires: fpc-src Requires: gdb -%if 0%{?sles_version} >= 11 +%if 0%{?sles_version} == 11 Requires: glib2-devel Requires: gtk2-devel %else @@ -68,10 +76,27 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Lazarus is a free and open source Rapid Application Development +Lazarus is a Rapid Application Development tool for the FreePascal compiler using the Lazarus component library - LCL. The LCL is included in this package. +%package -n libQt5Pas%{sover} +Summary: Free Pascal interface to Qt5 +License: LGPL-3.0 +Group: System/Libraries + +%description -n libQt5Pas%{sover} +Library that allows to use Qt5 with Free Pascal + +%package -n libQt5Pas-devel +Summary: Free Pascal interface to Qt5 +License: LGPL-3.0 +Group: Development/Libraries/Other +Requires: libQt5Pas%{sover} = %{version} + +%description -n libQt5Pas-devel +Development files for Free Pascal interface to Qt5. + %prep %setup -q -n %{name} %patch0 -p1 @@ -99,19 +124,21 @@ rm tools/install/create_lazarus_export_tgz.sh # fix lineencodings -dos2unix examples/gridexamples/grid_semaphor/example/table0*.stb dos2unix examples/trayicon/frmtest.* dos2unix examples/trayicon/wndtray.* # fix rpmlint error "spurious-executable-perm" chmod 644 docs/booth/ProdProgEntwMitOpenSourceSystems2007.odp -if [[ $SOURCE_DATE_EPOCH ]] ; then +if [ -n "$SOURCE_DATE_EPOCH" ] ; then datestr=$(date -u "-d@$SOURCE_DATE_EPOCH" +%Y/%m/%d) sed -i -e 's!{\$I %%date%%}!'"'$datestr'"'!' \ ide/ideinfodlg.pas ide/aboutfrm.pas ide/idefpcinfo.pas touch -d@"$SOURCE_DATE_EPOCH" ide/ideinfodlg.pas ide/aboutfrm.pas ide/idefpcinfo.pas # reset source timestamps because they are embedded in compiled files fi +# fix shebang +find . \( -name "*.sh" -o -name "*.pl" \) -exec sed -i '1s|#!/usr/bin/env|%{_bindir}/|' {} + + %build # Don't use -gs (use explicitly "stabs" debuginfo) for compiling lhelp but -g (use the default debuginfo type "dwarf") as in the rest of package's Makefiles # Fixes the "Stabs debuginfo not supported" error when extracting debug info from the package @@ -128,6 +155,17 @@ # build Qt4 interface make -C lcl/interfaces/qt all LCL_PLATFORM=qt OPT="-dQT_NATIVE_DIALOGS" +%if 0%{?sle_version} >= 120200 || 0%{?suse_version} > 1320 +# build Qt5 interface +make -C lcl/interfaces/qt5 all LCL_PLATFORM=qt5 OPT="-dQT_NATIVE_DIALOGS" + +# build libQt5Pas +pushd lcl/interfaces/qt5/cbindings +%qmake5 +make %{?_smp_mflags} +popd +%endif + %install make install \ INSTALL_PREFIX=%{buildroot}%{_prefix} \ @@ -136,6 +174,13 @@ LAZARUS_INSTALL_DIR=%{buildroot}%{_libdir}/%{name} \ _LIB=%{_lib} +%if 0%{?sle_version} >= 120200 || 0%{?suse_version} > 1320 +pushd lcl/interfaces/qt5/cbindings +%qmake5_install +install -Dpm 0644 qt5.pas %{buildroot}%{_datadir}/fpcsrc/packages/qt5/qt5.pas +popd +%endif + # convenience links for f in lazarus lazbuild startlazarus; do rm -f %{buildroot}%{_bindir}/$f @@ -145,7 +190,7 @@ ln -sf ../%{_lib}/%{name}/lazarus %{buildroot}%{_bindir}/lazarus-ide for f in lazres lrstolfm updatepofiles; do ln -sf ../%{_lib}/%{name}/tools/$f %{buildroot}%{_bindir}/$f - cat %{buildroot}%{_libdir}/%{name}/install/man/man1/${f}.1 | gzip > %{buildroot}%{_mandir}/man1/${f}.1.gz + cat %{buildroot}%{_libdir}/%{name}/install/man/man1/${f}.1 | gzip >%{buildroot}%{_mandir}/man1/${f}.1.gz done # collect docs and samples @@ -176,16 +221,20 @@ install -Dpm 0644 %{S:1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml # configs -install -Dpm 0644 tools/install/linux/editoroptions.xml %{buildroot}%{_sysconfdir}/%{name}/editoroptions.xml -cat tools/install/linux/environmentoptions.xml | sed -e "s#__LAZARUSDIR__#%{_libdir}/%{name}/#" -e "s#__FPCSRCDIR__#%{_datadir}/fpcsrc/#" > %{buildroot}%{_sysconfdir}/%{name}/environmentoptions.xml +install -dm 0755 %{buildroot}%{_sysconfdir}/%{name} +sed <tools/install/linux/environmentoptions.xml -e "s#__LAZARUSDIR__#%{_libdir}/%{name}/#" -e "s#__FPCSRCDIR__#%{_datadir}/fpcsrc/#" > %{buildroot}%{_sysconfdir}/%{name}/environmentoptions.xml + +# fix permissions +chmod -x %{buildroot}%{_defaultdocdir}/%{name}/docs/html/build_lcl_chm.sh \ + %{buildroot}%{_defaultdocdir}/%{name}/docs/xml/multi_makeskel.pl # cleanup rm -rf %{buildroot}%{_libdir}/%{name}/install/man rm -f %{buildroot}%{_libdir}/%{name}/Makefile.fpc.orig -%if 0%{?suse_version} +rm -rf %{buildroot}%{_libdir}/%{name}/lcl/interfaces/qt5/cbindings %fdupes -s %{buildroot} -%endif +%if 0%{?suse_version} <= 1320 %post %if 0%{?suse_version} >= 1140 %mime_database_post @@ -203,13 +252,19 @@ %else /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : %endif +%endif + +%if 0%{?sle_version} >= 120200 || 0%{?suse_version} > 1320 +%post -n libQt5Pas%{sover} -p /sbin/ldconfig + +%postun -n libQt5Pas%{sover} -p /sbin/ldconfig +%endif %files %defattr(-,root,root,-) %doc %{_mandir}/man1/* %doc %{_defaultdocdir}/%{name} %dir %{_sysconfdir}/%{name} -%config(noreplace) %{_sysconfdir}/%{name}/editoroptions.xml %config(noreplace) %{_sysconfdir}/%{name}/environmentoptions.xml %{_bindir}/%{name} %{_bindir}/%{name}-ide @@ -229,4 +284,20 @@ %dir %{_datadir}/appdata/ %{_datadir}/appdata/%{name}.appdata.xml +%if 0%{?sle_version} >= 120200 || 0%{?suse_version} > 1320 +%files -n libQt5Pas%{sover} +%defattr(-,root,root,-) +%doc lcl/interfaces/qt5/cbindings/COPYING.TXT +%{_libdir}/libQt5Pas.so.%{sover}* + +%files -n libQt5Pas-devel +%defattr(-,root,root,-) +%doc lcl/interfaces/qt5/cbindings/COPYING.TXT +%dir %{_datadir}/fpcsrc +%dir %{_datadir}/fpcsrc/packages +%dir %{_datadir}/fpcsrc/packages/qt5 +%{_datadir}/fpcsrc/packages/qt5/qt5.pas +%{_libdir}/libQt5Pas.so +%endif + %changelog ++++++ lazarus-1.6.2-0.tar.gz -> lazarus-1.8.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/lazarus/lazarus-1.6.2-0.tar.gz /work/SRC/openSUSE:Factory/.lazarus.new/lazarus-1.8.0.tar.gz differ: char 5, line 1 ++++++ lazarus.desktop.patch ++++++ --- /var/tmp/diff_new_pack.Z8vTit/_old 2018-01-09 14:52:40.781246622 +0100 +++ /var/tmp/diff_new_pack.Z8vTit/_new 2018-01-09 14:52:40.785246434 +0100 @@ -1,6 +1,6 @@ diff -Pdpru lazarus.orig/install/lazarus.desktop lazarus/install/lazarus.desktop --- lazarus.orig/install/lazarus.desktop 2014-06-15 10:57:06.000000000 +0200 -+++ lazarus/install/lazarus.desktop 2015-04-23 00:08:30.474115079 +0200 ++++ lazarus/install/lazarus.desktop 2017-12-17 18:02:31.608204947 +0100 @@ -1,16 +1,12 @@ [Desktop Entry] Name=Lazarus
