!3 Update dde-calendar to 5.7.0.5
From: @weidongkl Reviewed-by: @yeqinglong01 Signed-off-by: @yeqinglong01
This commit is contained in:
commit
8f20bdacf6
@ -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)
|
|
||||||
BIN
dde-calendar-5.7.0.5.tar.gz
Normal file
BIN
dde-calendar-5.7.0.5.tar.gz
Normal file
Binary file not shown.
57
dde-calendar.spec
Normal file
57
dde-calendar.spec
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
Name: dde-calendar
|
||||||
|
Version: 5.7.0.5
|
||||||
|
Release: 1
|
||||||
|
Summary: Calendar for Deepin Desktop Environment
|
||||||
|
License: GPLv3+
|
||||||
|
URL: https://github.com/linuxdeepin/%{name}
|
||||||
|
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
|
Provides: deepin-calendar
|
||||||
|
Obsoletes: deepin-calendar
|
||||||
|
|
||||||
|
BuildRequires: gcc-c++
|
||||||
|
BuildRequires: cmake
|
||||||
|
BuildRequires: qt5-devel
|
||||||
|
|
||||||
|
BuildRequires: dtkcore-devel
|
||||||
|
BuildRequires: dtkwidget-devel
|
||||||
|
BuildRequires: pkgconfig(dtkgui)
|
||||||
|
BuildRequires: pkgconfig(dframeworkdbus)
|
||||||
|
|
||||||
|
%description
|
||||||
|
%{summary}.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%autosetup
|
||||||
|
|
||||||
|
%build
|
||||||
|
# help find (and prefer) qt5 utilities, e.g. qmake, lrelease
|
||||||
|
export PATH=%{_qt5_bindir}:$PATH
|
||||||
|
# cmake_minimum_required version is too high
|
||||||
|
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}
|
||||||
|
|
||||||
|
%make_build
|
||||||
|
popd
|
||||||
|
|
||||||
|
%install
|
||||||
|
%make_install -C build INSTALL_ROOT="%buildroot"
|
||||||
|
|
||||||
|
%files
|
||||||
|
%doc README.md
|
||||||
|
%license LICENSE
|
||||||
|
%{_bindir}/%{name}
|
||||||
|
%{_datadir}/%{name}/translations/*.qm
|
||||||
|
%{_datadir}/dbus-1/services/com.deepin.Calendar.service
|
||||||
|
%{_datadir}/applications/%{name}.desktop
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Wed Jul 07 2021 weidong <weidong@uniontech.com> - 5.7.0.5-1
|
||||||
|
- Update to 5.7.0.5
|
||||||
|
|
||||||
|
* Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.6.1-4
|
||||||
|
- fix spec
|
||||||
|
|
||||||
|
* Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.6.1-3
|
||||||
|
- Package init
|
||||||
Binary file not shown.
@ -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 <buildteam@openeuler.org> - 5.6.1-4
|
|
||||||
- fix spec
|
|
||||||
|
|
||||||
* Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.6.1-3
|
|
||||||
- Package init
|
|
||||||
Loading…
x
Reference in New Issue
Block a user