[chinese-calendar/f19] Update to 0.8.1 Unbundle QtSingleApplication

Christopher Meng cicku at fedoraproject.org
Thu Feb 13 02:59:03 UTC 2014


commit fb3c0b532c96e759be941ec76aab41bd89d053c9
Author: Christopher Meng <i at cicku.me>
Date:   Thu Feb 13 10:58:51 2014 +0800

    Update to 0.8.1
    Unbundle QtSingleApplication

 .gitignore                              |    1 +
 0002-Unbundle-QtSingleApplication.patch |   25 +++++++++++++++++++++++++
 chinese-calendar.spec                   |   25 ++++++++++++++++++-------
 sources                                 |    2 +-
 4 files changed, 45 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dfc1573..8474399 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /chinese-calendar_0.7.9.orig.tar.gz
 /chinese-calendar_0.8.0.orig.tar.gz
+/chinese-calendar_0.8.1.orig.tar.gz
diff --git a/0002-Unbundle-QtSingleApplication.patch b/0002-Unbundle-QtSingleApplication.patch
new file mode 100644
index 0000000..a8b9397
--- /dev/null
+++ b/0002-Unbundle-QtSingleApplication.patch
@@ -0,0 +1,25 @@
+From c69d849795bcd8e83c1b3c4dfb6e32574ce64832 Mon Sep 17 00:00:00 2001
+From: Christopher Meng <i at cicku.me>
+Date: Thu, 13 Feb 2014 10:53:06 +0800
+Subject: [PATCH 2/2] Unbundle QtSingleApplication
+
+---
+ chinese-calendar.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chinese-calendar.pro b/chinese-calendar.pro
+index 4755c6d..9ecea18 100644
+--- a/chinese-calendar.pro
++++ b/chinese-calendar.pro
+@@ -54,7 +54,7 @@ INSTALLS += inst \
+     readme \
+     target
+ 
+-include(qtsingleapplication/src/qtsingleapplication.pri)
++CONFIG += qtsingleapplication
+ 
+ QT += core gui\
+     sql \
+-- 
+1.8.5.3
+
diff --git a/chinese-calendar.spec b/chinese-calendar.spec
index 61275df..fe1dde4 100644
--- a/chinese-calendar.spec
+++ b/chinese-calendar.spec
@@ -1,19 +1,23 @@
 Name:           chinese-calendar
-Version:        0.8.0
+Version:        0.8.1
 Release:        1%{?dist}
 Summary:        A Chinese traditional calendar of UbuntuKylin
 License:        GPLv3
 URL:            https://launchpad.net/chinese-calendar
 Source0:        https://launchpad.net/chinese-calendar/0.8/%{version}/+download/%{name}_%{version}.orig.tar.gz
+Patch0:         0002-Unbundle-QtSingleApplication.patch
+BuildRequires:  desktop-file-utils
 BuildRequires:  qt4-devel
+BuildRequires:  qtsingleapplication-devel
 
 %description
-This is a Chinese traditional calendar for UbuntuKylin. There is an 
-attachment with festivals and solar terms In China. In line with the 
-Chinese useing habit,it can help users to query date conveniently.
+This is a Chinese traditional calendar for UbuntuKylin. In line with the 
+Chinese habit,it can help users to query date conveniently.
 
 %prep
 %setup -q
+%patch0 -p1
+rm -rf qtsingleapplication
 
 %build
 %qmake_qt4
@@ -22,6 +26,9 @@ make %{?_smp_mflags}
 %install
 make install INSTALL_ROOT=%{buildroot}
 
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
+
 %files
 %exclude %{_sysconfdir}/xdg/autostart/*.desktop
 %{_bindir}/chinese-calendar-autostart
@@ -31,14 +38,18 @@ make install INSTALL_ROOT=%{buildroot}
 %{_datadir}/pixmaps/chinesecalendar-64.png
 
 %changelog
+* Thu Feb 13 2014 Christopher Meng <rpm at cicku.me> - 0.8.1-1
+- Update to 0.8.1(BZ#1064175)
+- Use system QtSingleApplication(BZ#1064645)
+
 * Mon Aug 26 2013 Christopher Meng <rpm at cicku.me> - 0.8.0-1
-- Update to new version.
+- Update to 0.8.0
 
 * Mon Aug 05 2013 Christopher Meng <rpm at cicku.me> - 0.7.9-1
-- Update to new version.
+- Update to 0.7.9
 
 * Fri Jun 21 2013 Christopher Meng <rpm at cicku.me> - 0.7.8-1
-- Update to new version.
+- Update to 0.7.8
 
 * Sat Mar 16 2013 Christopher Meng <rpm at cicku.me> - 0.7.4-1
 - Initial Package.
diff --git a/sources b/sources
index d2ec793..01ef1f8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-58306195d7a5f293999b328a82cc3993  chinese-calendar_0.8.0.orig.tar.gz
+2cc1b13af068cbe36aff6bf357f11a44  chinese-calendar_0.8.1.orig.tar.gz


More information about the scm-commits mailing list