diff --git a/calendar_time.patch b/calendar_time.patch deleted file mode 100644 index 672624d..0000000 --- a/calendar_time.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/schedulesdbus.cpp b/src/schedulesdbus.cpp -index a9f0f4e..4d05ee9 100755 ---- a/src/schedulesdbus.cpp -+++ b/src/schedulesdbus.cpp -@@ -282,8 +282,7 @@ QString CSchedulesDBus::toconvertData(QDateTime date) - - QDateTime CSchedulesDBus::fromconvertData(QString str) - { -- QStringList liststr = str.split("+", QString::SkipEmptyParts); -- return QDateTime::fromString(liststr.at(0), "yyyy-MM-ddThh:mm:ss"); -+ return QDateTime::fromString(str, Qt::ISODate); - } - - QString CSchedulesDBus::toconvertIGData(QDateTime date) diff --git a/dde-calendar-5.8.20.1.tar.gz b/dde-calendar-5.8.20.1.tar.gz new file mode 100644 index 0000000..62cc8a5 Binary files /dev/null and b/dde-calendar-5.8.20.1.tar.gz differ diff --git a/dde-calendar.spec b/dde-calendar.spec new file mode 100644 index 0000000..85e00ec --- /dev/null +++ b/dde-calendar.spec @@ -0,0 +1,49 @@ +Name: dde-calendar +Version: 5.8.20.1 + +Release: 1%{?dist}.01 +Summary: Calendar is a smart daily planner to schedule all things in life +License: GPLv3 +URL: https://github.com/linuxdeepin/dde-calendar +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz + +BuildRequires: cmake +BuildRequires: qt5-devel +BuildRequires: dtkgui-devel +BuildRequires: dtkwidget-devel +BuildRequires: pkgconfig(dframeworkdbus) +BuildRequires: gtest-devel +BuildRequires: dtkcommon-devel + +%description +%{summary}. + +%prep +%autosetup + +%build +export PATH=%{_qt5_bindir}:$PATH +sed -i "s|^cmake_minimum_required.*|cmake_minimum_required(VERSION 3.0)|" $(find . -name "CMakeLists.txt") +mkdir build && pushd build +%cmake -DCMAKE_BUILD_TYPE=Release ../ -DAPP_VERSION=%{version} -DVERSION=%{version} -DCMAKE_SCHEDULE_PLUGIN_OFF="OFF" +%make_build +popd + +%install +%make_install -C build INSTALL_ROOT="%buildroot" + +%files +%doc README.md +%license LICENSE +%{_bindir}/%{name} +%{_datadir}/applications/%{name}.desktop +%{_datadir}/%{name}/translations/*.qm +%{_datadir}/deepin-manual/manual-assets/application/dde-calendar/calendar/* +%{_datadir}/dbus-1/services/*.service +/etc/xdg/autostart/dde-calendar-service.desktop +%{_datadir}/dde-calendar/data/* +/usr/lib/deepin-daemon/dde-calendar-service + +%changelog +* Tue Jun 14 2022 uoser - 5.8.20.1-1.01 +- update: update to 5.8.20.1-1.01 diff --git a/dde-calendar_5.6.1.orig.tar.xz b/dde-calendar_5.6.1.orig.tar.xz deleted file mode 100644 index 40f363c..0000000 Binary files a/dde-calendar_5.6.1.orig.tar.xz and /dev/null differ diff --git a/deepin-calendar.spec b/deepin-calendar.spec deleted file mode 100644 index 5e1c272..0000000 --- a/deepin-calendar.spec +++ /dev/null @@ -1,60 +0,0 @@ -%global repo dde-calendar - -Name: deepin-calendar -Version: 5.6.1 -Release: 4 -Summary: Calendar for Deepin Desktop Environment -License: GPLv3+ -URL: https://github.com/linuxdeepin/dde-calendar -Source0: %{repo}_%{version}.orig.tar.xz -Patch0: calendar_time.patch - -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtsvg-devel -BuildRequires: dde-qt-dbus-factory-devel -BuildRequires: deepin-gettext-tools -BuildRequires: desktop-file-utils -BuildRequires: qt5-linguist -BuildRequires: pkgconfig(dtkwidget) >= 5.1.1 -BuildRequires: pkgconfig(dtkgui) -BuildRequires: pkgconfig(dtkcore) >= 5.1.1 -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: qt5-qtmultimedia-devel qt5-qtx11extras-devel -Requires: dde-api - -%description -Calendar for Deepin Desktop Environment. - -%prep -%setup -q -n %{repo}-%{version} -sed -i 's|lrelease|lrelease-qt5|g' translate_generation.sh -%patch0 -p1 - -%build -%{qmake_qt5} PREFIX=%{_prefix} -%make_build - -%install -%make_install INSTALL_ROOT=%{buildroot} - -%check -desktop-file-validate %{buildroot}%{_datadir}/applications/%{repo}.desktop - -%files -%doc README.md -%license LICENSE -%{_bindir}/%{repo} -%{_datadir}/%{repo}/ -%{_datadir}/dbus-1/services/com.deepin.Calendar.service -%{_datadir}/applications/%{repo}.desktop -%{_datadir}/icons/hicolor/scalable/apps/%{repo}.svg - -%changelog -* Thu Jul 30 2020 openEuler Buildteam - 5.6.1-4 -- fix spec - -* Thu Jul 30 2020 openEuler Buildteam - 5.6.1-3 -- Package init