Hello community, here is the log from the commit of package deepin-tool-kit for openSUSE:Factory checked in at 2017-11-02 10:24:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-tool-kit (Old) and /work/SRC/openSUSE:Factory/.deepin-tool-kit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-tool-kit" Thu Nov 2 10:24:43 2017 rev:3 rq:529030 version:1.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-tool-kit/deepin-tool-kit.changes 2017-04-11 09:46:03.929433279 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-tool-kit.new/deepin-tool-kit.changes 2017-11-02 10:24:42.983402966 +0100 @@ -1,0 +2,7 @@ +Wed Sep 27 13:15:02 UTC 2017 - [email protected] + +- Update to 1.0.0 + * Fix name for pkgconfig profile. + * Use dtksettings. + +------------------------------------------------------------------- Old: ---- deepin-tool-kit-0.2.1.tar.gz New: ---- deepin-tool-kit-1.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-tool-kit.spec ++++++ --- /var/tmp/diff_new_pack.h4oGUc/_old 2017-11-02 10:24:43.763374538 +0100 +++ /var/tmp/diff_new_pack.h4oGUc/_new 2017-11-02 10:24:43.767374392 +0100 @@ -16,81 +16,85 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%define libver 1 Name: deepin-tool-kit -Version: 0.2.1 +Version: 1.0.0 Release: 0 Summary: Deepin Tool Kit Base Devel library License: GPL-3.0+ Group: Development/Libraries/X11 Url: https://github.com/linuxdeepin/deepin-tool-kit -Source0: %{name}-%{version}.tar.gz +Source0: https://github.com/linuxdeepin/deepin-tool-kit/archive/%{version}/%{name}-%{version}.tar.gz +BuildRequires: fdupes BuildRequires: libqt5-linguist +BuildRequires: libqt5-qtbase-private-headers-devel BuildRequires: libqt5-qtdeclarative-devel -BuildRequires: libqt5-qtx11extras-devel BuildRequires: libqt5-qtmultimedia-devel -BuildRequires: libqt5-qtbase-private-headers-devel -BuildRequires: pkgconfig(xcb-util) +BuildRequires: libqt5-qtx11extras-devel +BuildRequires: libqt5-linguist +BuildRequires: pkgconfig(gsettings-qt) BuildRequires: pkgconfig(libstartup-notification-1.0) -Requires: libdtkbase-devel = %{version} -Requires: libdtkutil-devel = %{version} -Requires: libdtkwidget-devel = %{version} +BuildRequires: pkgconfig(xcb-util) +BuildRequires: pkgconfig(dtksettings) +BuildRequires: pkgconfig(dtksettingsview) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The Deepin Tool Kit (Dtk) is the base devlopment tool for all C++/Qt-based work on Deepin. -%package -n libdtkbase1 +%package -n libdtkbase1-%{libver} Summary: Deepin Tool Kit base library Group: System/Libraries Requires: %{name} -%description -n libdtkbase1 +%description -n libdtkbase1-%{libver} The Deepin Tool Kit (Dtk) is the base devlopment tool for all C++/Qt-based work on Deepin. -%package -n libdtkbase-devel +%package -n libdtkbase1-devel Summary: Development tools for libdtkbase Group: Development/Libraries/X11 -Requires: libdtkbase1 = %{version} +Requires: libdtkbase1-%{libver} = %{version} -%description -n libdtkbase-devel +%description -n libdtkbase1-devel The libdtkbase-devel package contains the header files and developer docs for libdtkbase1. -%package -n libdtkutil1 +%package -n libdtkutil1-%{libver} Summary: Deepin Tool Kit utility library Group: System/Libraries Requires: %{name} -%description -n libdtkutil1 +%description -n libdtkutil1-%{libver} The Deepin Tool Kit (Dtk) is the base devlopment tool for all C++/Qt-based work on Deepin. -%package -n libdtkutil-devel +%package -n libdtkutil1-devel Summary: Development tools for libdtkutil Group: Development/Libraries/X11 -Requires: libdtkutil1 = %{version} +Requires: libdtkutil1-%{libver} = %{version} -%description -n libdtkutil-devel +%description -n libdtkutil1-devel The libdtkutil-devel package contains the header files and developer docs for libdtkutil. -%package -n libdtkwidget1 +%package -n libdtkwidget1-%{libver} Summary: Deepin Tool Kit widget library Group: System/Libraries Requires: %{name} -%description -n libdtkwidget1 +%description -n libdtkwidget1-%{libver} The Deepin Tool Kit (Dtk) is the base devlopment tool for all C++/Qt-based work on Deepin. -%package -n libdtkwidget-devel +%package -n libdtkwidget1-devel Summary: Development tools for libdtkwidget -Requires: libdtkwidget1 = %{version} +Group: Development/Libraries/X11 +Requires: libdtkwidget1-%{libver} = %{version} -%description -n libdtkwidget-devel +%description -n libdtkwidget1-devel The libdtkwidget-devel package contains the header files and developer docs for libdtkwidget1. @@ -98,9 +102,7 @@ %setup -q %build -sed -i 's|lrelease|lrelease-qt5|g' tool/translate_generation.sh -sed -i -E '/test|examples/d' dtk.pro - +sed -i 's/lrelease/lrelease-qt5/g' tool/translate_generation.sh %qmake5 DEFINES+=QT_NO_DEBUG_OUTPUT \ PREFIX=%{_prefix} \ LIB_INSTALL_DIR=%{_libdir} @@ -110,72 +112,68 @@ %qmake5_install # Fix paths in .pc files -sed -i 's|${prefix}|/usr|g' %{buildroot}%{_libdir}/pkgconfig/dtkbase.pc -sed -i 's|${prefix}|/usr|g' %{buildroot}%{_libdir}/pkgconfig/dtkutil.pc -sed -i 's|${prefix}|/usr|g' %{buildroot}%{_libdir}/pkgconfig/dtkwidget.pc -sed -i 's|${includedir}|/usr/include|g' %{buildroot}%{_libdir}/pkgconfig/dtkbase.pc -sed -i 's|${includedir}|/usr/include|g' %{buildroot}%{_libdir}/pkgconfig/dtkutil.pc -sed -i 's|${includedir}|/usr/include|g' %{buildroot}%{_libdir}/pkgconfig/dtkwidget.pc -sed -i 's|-L/home/abuild/rpmbuild/BUILD/deepin-tool-kit-0.2.1/dutil/../dbase/ ||g' %{buildroot}%{_libdir}/pkgconfig/dtkutil.pc -sed -i 's|-L/home/abuild/rpmbuild/BUILD/deepin-tool-kit-0.2.1/dwidget/../dbase/ -ldtkbase -L/home/abuild/rpmbuild/BUILD/deepin-tool-kit-0.2.1/dwidget/../dutil/ ||g' \ -%{buildroot}%{_libdir}/pkgconfig/dtkwidget.pc -sed -i 's,-I/usr/include,-I/usr/include/libdtk-1.0/DBase,g' %{buildroot}%{_libdir}/pkgconfig/dtkbase.pc -sed -i 's,-I/usr/include,-I/usr/include/libdtk-1.0/DUtil,g' %{buildroot}%{_libdir}/pkgconfig/dtkutil.pc -sed -i 's,-I/usr/include,-I/usr/include/libdtk-1.0/DWidget,g' %{buildroot}%{_libdir}/pkgconfig/dtkwidget.pc - -# Fix the name for pkgconfig files -mv %{buildroot}%{_libdir}/pkgconfig/dtkbase.pc %{buildroot}%{_libdir}/pkgconfig/dtkbase-0-2.pc -mv %{buildroot}%{_libdir}/pkgconfig/dtkutil.pc %{buildroot}%{_libdir}/pkgconfig/dtkutil-0-2.pc -mv %{buildroot}%{_libdir}/pkgconfig/dtkwidget.pc %{buildroot}%{_libdir}/pkgconfig/dtkwidget-0-2.pc - -%post -n libdtkbase1 -p /sbin/ldconfig - -%postun -n libdtkbase1 -p /sbin/ldconfig +sed -i 's|-L/home/abuild/rpmbuild/BUILD/%{name}-%{version}/dutil/../dbase/ ||g' \ +%{buildroot}%{_libdir}/pkgconfig/dtkutil1.pc +sed -i 's|-L/home/abuild/rpmbuild/BUILD/%{name}-%{version}/dwidget/../dbase/ \ +-ldtkbase -L/home/abuild/rpmbuild/BUILD/%{name}-%{version}/dwidget/../dutil/ \ +|-ldtkbase|g' %{buildroot}%{_libdir}/pkgconfig/dtkwidget1.pc +sed -i 's|-I/usr/include|-I/usr/include/libdtk-1.1/DBase|g' %{buildroot}%{_libdir}/pkgconfig/dtkbase1.pc +sed -i 's|-I/usr/include|-I/usr/include/libdtk-1.1/DUtil|g' %{buildroot}%{_libdir}/pkgconfig/dtkutil1.pc +sed -i 's|-I/usr/include|-I/usr/include/libdtk-1.1/DWidget|g' %{buildroot}%{_libdir}/pkgconfig/dtkwidget1.pc + +# Remove useless files +rm -rf %{buildroot}/usr/tests + +%fdupes %{buildroot} + +%post -n libdtkbase1-%{libver} -p /sbin/ldconfig + +%postun -n libdtkbase1-%{libver} -p /sbin/ldconfig -%post -n libdtkutil1 -p /sbin/ldconfig +%post -n libdtkutil1-%{libver} -p /sbin/ldconfig -%postun -n libdtkutil1 -p /sbin/ldconfig +%postun -n libdtkutil1-%{libver} -p /sbin/ldconfig -%post -n libdtkwidget1 -p /sbin/ldconfig +%post -n libdtkwidget1-%{libver} -p /sbin/ldconfig -%postun -n libdtkwidget1 -p /sbin/ldconfig +%postun -n libdtkwidget1-%{libver} -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc debian/copyright README.md Specification.md -%files -n libdtkbase1 +%files -n libdtkbase1-%{libver} %defattr(-,root,root,-) -%{_libdir}/libdtkbase.so.* +%{_libdir}/libdtkbase1.so.* -%files -n libdtkbase-devel +%files -n libdtkbase1-devel %defattr(-,root,root,-) -%dir %{_includedir}/libdtk-1.0 -%{_includedir}/libdtk-1.0/DBase/ -%{_libdir}/pkgconfig/dtkbase-0-2.pc -%{_libdir}/libdtkbase.so +%dir %{_includedir}/libdtk-1.1 +%{_includedir}/libdtk-1.1/DBase/ +%{_libdir}/pkgconfig/dtkbase1.pc +%{_libdir}/libdtkbase1.so -%files -n libdtkutil1 +%files -n libdtkutil1-%{libver} %defattr(-,root,root,-) -%{_libdir}/libdtkutil.so.* +%{_libdir}/libdtkutil1.so.* -%files -n libdtkutil-devel +%files -n libdtkutil1-devel %defattr(-,root,root,-) -%{_includedir}/libdtk-1.0/DUtil/ -%{_libdir}/pkgconfig/dtkutil-0-2.pc -%{_libdir}/libdtkutil.so +%{_includedir}/libdtk-1.1/DUtil/ +%{_libdir}/pkgconfig/dtkutil1.pc +%{_libdir}/libdtkutil1.so -%files -n libdtkwidget1 +%files -n libdtkwidget1-%{libver} %defattr(-,root,root,-) -%{_libdir}/libdtkwidget.so.* -%dir %{_datadir}/dtkwidget -%dir %{_datadir}/dtkwidget/translations -%{_datadir}/dtkwidget/translations/* +%{_libdir}/libdtkwidget1.so.* +%dir %{_datadir}/dtkwidget1 +%dir %{_datadir}/dtkwidget1/translations +%{_datadir}/dtkwidget1/translations/* -%files -n libdtkwidget-devel +%files -n libdtkwidget1-devel %defattr(-,root,root,-) -%{_includedir}/libdtk-1.0/DWidget/ -%{_libdir}/pkgconfig/dtkwidget-0-2.pc -%{_libdir}/libdtkwidget.so +%{_includedir}/libdtk-1.1/DWidget/ +%{_libdir}/pkgconfig/dtkwidget1.pc +%{_libdir}/libdtkwidget1.so %changelog ++++++ deepin-tool-kit-0.2.1.tar.gz -> deepin-tool-kit-1.0.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/deepin-tool-kit/deepin-tool-kit-0.2.1.tar.gz /work/SRC/openSUSE:Factory/.deepin-tool-kit.new/deepin-tool-kit-1.0.0.tar.gz differ: char 12, line 1
