From 98d0453e64e5d90a37ef4b7c4053204053a8c567 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Jun 11 2018 07:08:51 +0000 Subject: renamed to elementary-calendar --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index ceafc35..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/maya-calendar-0.4.0.2.tar.xz -/maya-calendar-0.4.1.tar.gz diff --git a/00-fix-linker-flags.patch b/00-fix-linker-flags.patch deleted file mode 100644 index b0f1648..0000000 --- a/00-fix-linker-flags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index a0cf361..3feae62 100644 ---- a/core/CMakeLists.txt -+++ b/core/CMakeLists.txt -@@ -47,7 +47,7 @@ set_target_properties (${CORE_LIBRARY_NAME} PROPERTIES - SOVERSION ${CORE_LIB_SOVERSION} - ) - --target_link_libraries (${CORE_LIBRARY_NAME} ${CORE_LIBRARIES}) -+target_link_libraries (${CORE_LIBRARY_NAME} ${CORE_LIBRARIES} m) - - install (TARGETS ${CORE_LIBRARY_NAME} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}) - # Install lib stuffs diff --git a/01-fix-vala-040-incompatibility.patch b/01-fix-vala-040-incompatibility.patch deleted file mode 100644 index 79675ec..0000000 --- a/01-fix-vala-040-incompatibility.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d73b0b6..512c705 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -125,7 +125,7 @@ pkg_check_modules (DEPS REQUIRED ${DEPS_PKG}) - - find_package (Vala REQUIRED) - include (ValaVersion) --ensure_vala_version ("0.23.2" MINIMUM) -+ensure_vala_version ("0.40.4" MINIMUM) - include (ValaPrecompile) - - add_subdirectory (po) -diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index a0cf361..b5351d3 100644 ---- a/core/CMakeLists.txt -+++ b/core/CMakeLists.txt -@@ -27,8 +27,6 @@ vala_precompile (CORE_VALA_C ${CORE_LIBRARY_NAME} - ${CORE_PACKAGES} - OPTIONS - ${BASIC_VALAC_OPTIONS} -- CUSTOM_VAPIS -- ${CMAKE_SOURCE_DIR}/vapi/posix-extension.vapi - GENERATE_VAPI - ${CMAKE_PROJECT_NAME} - GENERATE_HEADER -diff --git a/core/Model/CalendarModel.vala b/core/Model/CalendarModel.vala -index c2293d4..3e3b8cb 100644 ---- a/core/Model/CalendarModel.vala -+++ b/core/Model/CalendarModel.vala -@@ -68,7 +68,7 @@ public class Maya.Model.CalendarModel : Object { - } - - private CalendarModel () { -- int week_start = Posix.nl_langinfo2 (Posix.NLTime.FIRST_WEEKDAY).data[0]; -+ int week_start = Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0]; - if (week_start >= 1 && week_start <= 7) { - week_starts_on = (Maya.Settings.Weekday)week_start-1; - } -diff --git a/vapi/posix-extension.vapi b/vapi/posix-extension.vapi -deleted file mode 100644 -index 9c6d039..0000000 ---- a/vapi/posix-extension.vapi -+++ /dev/null -@@ -1,15 +0,0 @@ --[CCode (cprefix = "", lower_case_cprefix = "")] --namespace Posix { -- [CCode (cheader_filename = "langinfo.h", cname = "nl_item", cprefix = "_NL_TIME_", has_type_id = false)] -- public enum NLTime { -- WEEK_NDAYS, -- WEEK_1STDAY, -- WEEK_1STWEEK, -- FIRST_WEEKDAY, -- FIRST_WORKDAY, -- CAL_DIRECTION, -- TIMEZONE -- } -- [CCode (cname = "nl_langinfo",cheader_filename = "langinfo.h")] -- public unowned string nl_langinfo2 (NLTime item); --} diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..b00c5e4 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +renamed to elementary-calendar diff --git a/maya-calendar.spec b/maya-calendar.spec deleted file mode 100644 index 68965d7..0000000 --- a/maya-calendar.spec +++ /dev/null @@ -1,201 +0,0 @@ -%global srcname calendar - -Name: maya-calendar -Summary: The official elementary calendar -Version: 0.4.1 -Release: 5%{?dist} -License: GPLv3+ - -URL: https://github.com/elementary/%{srcname} -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz - -# Patch to fix undefined symbols -Patch0: 00-fix-linker-flags.patch - -# Backported upstream patch to fix incompatibilities with vala 0.40+ -# https://github.com/elementary/calendar/pull/234 -Patch1: 01-fix-vala-040-incompatibility.patch - -BuildRequires: cmake -BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: intltool -BuildRequires: libappstream-glib -BuildRequires: vala >= 0.40.4 - -BuildRequires: pkgconfig(champlain-0.12) -BuildRequires: pkgconfig(champlain-gtk-0.12) -BuildRequires: pkgconfig(clutter-1.0) -BuildRequires: pkgconfig(folks) -BuildRequires: pkgconfig(gee-0.8) -BuildRequires: pkgconfig(geocode-glib-1.0) -BuildRequires: pkgconfig(gio-2.0) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gobject-2.0) -BuildRequires: pkgconfig(gmodule-2.0) -BuildRequires: pkgconfig(granite) >= 0.5 -BuildRequires: pkgconfig(gthread-2.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.11.6 -BuildRequires: pkgconfig(libecal-1.2) >= 3.8.0 -BuildRequires: pkgconfig(libical) -BuildRequires: pkgconfig(libnotify) - -# maya-calendar also provides a generic symbolic icon (actions/calendar-go-today) -Requires: hicolor-icon-theme - - -%description -A slim, lightweight GTK+3 calendar app written in Vala, designed for -elementary OS. Also looks and works great on other GTK+ desktops. - - -%package devel -Summary: The official elementary calendar (devel files) -Requires: %{name}%{?_isa} = %{version}-%{release} -%description devel -A slim, lightweight GTK+3 calendar app written in Vala, designed for -elementary OS. Also looks and works great on other GTK+ desktops. - -This package contains the development files. - - -%prep -%autosetup -n %{srcname}-%{version} -p1 - - -%build -mkdir build && pushd build -%cmake .. -%make_build -popd - - -%install -pushd build -%make_install -popd - -%find_lang maya-calendar - - -%check -desktop-file-validate \ - %{buildroot}/%{_datadir}/applications/org.pantheon.maya.desktop -desktop-file-validate \ - %{buildroot}/%{_datadir}/applications/org.pantheon.maya-daemon.desktop - -appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/appdata/org.pantheon.maya.appdata.xml - - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - - -%files -f maya-calendar.lang -%doc AUTHORS README.md -%license COPYING - -%{_bindir}/maya-calendar -%{_bindir}/maya-calendar-daemon - -%{_libdir}/libmaya-calendar.so.0 -%{_libdir}/libmaya-calendar.so.0.1 -%{_libdir}/maya-calendar/ - -%{_datadir}/appdata/org.pantheon.maya.appdata.xml -%{_datadir}/applications/org.pantheon.maya.desktop -%{_datadir}/applications/org.pantheon.maya-daemon.desktop -%{_datadir}/glib-2.0/schemas/org.pantheon.maya.gschema.xml -%{_datadir}/icons/hicolor/scalable/actions/calendar-go-today.svg -%{_datadir}/maya-calendar/ - - -%files devel -%{_includedir}/maya-calendar/ - -%{_libdir}/libmaya-calendar.so -%{_libdir}/pkgconfig/maya-calendar.pc - -%{_datadir}/vala/vapi/maya-calendar.deps -%{_datadir}/vala/vapi/maya-calendar.vapi - - -%changelog -* Tue May 01 2018 Fabio Valentini - 0.4.1-5 -- Add backported patch to fix building with newer versions of vala. - -* Wed Feb 07 2018 Kalev Lember - 0.4.1-4 -- Rebuilt for evolution-data-server soname bump - -* Wed Jan 24 2018 Fabio Valentini - 0.4.1-3 -- Add patch to fix undefined symbols. - -* Sat Jan 06 2018 Fabio Valentini - 0.4.1-2 -- Remove icon cache scriptlets, replaced by file triggers. - -* Sat Dec 02 2017 Fabio Valentini - 0.4.1-1 -- Update to version 0.4.1. -- Drop now redundant patches. -- Fetch sources from github instead of launchpad. -- Bump granite dependency to 0.5+. -- Add missing BuildRequires: libnotify. - -* Wed Nov 08 2017 Fabio Valentini - 0.4.0.2-15 -- Rebuild for libical soname bump. - -* Sat Nov 04 2017 Fabio Valentini - 0.4.0.2-14 -- Rebuild for granite soname bump. -- Add backported patch to fix builds with newer vala versions. -- Add upstream patch to fix builds with granite 0.5+. - -* Thu Aug 03 2017 Fedora Release Engineering - 0.4.0.2-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.4.0.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0.4.0.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Jan 28 2017 Fabio Valentini - 0.4.0.2-10 -- Rename icon to match .desktop file. -- Ship branded .desktop file. - -* Wed Jan 25 2017 Fabio Valentini -- Remove explicit BR: /usr/bin/pkgconfig. - -* Mon Jan 23 2017 Fabio Valentini - 0.4.0.2-9 -- Bundle application icon. Explicitly Requires: /usr/bin/pkg-config. - -* Sun Jan 01 2017 Fabio Valentini - 0.4.0.2-8 -- Mark COPYRIGHT as %%license as well. - -* Sat Dec 31 2016 Fabio Valentini - 0.4.0.2-7 -- Clean up spec file. - -* Thu Sep 29 2016 Fabio Valentini - 0.4.0.2-6 -- Mass rebuild. - -* Wed Sep 28 2016 Fabio Valentini - 0.4.0.2-5 -- Spec file cleanups. - -* Wed Sep 28 2016 Fabio Valentini - 0.4.0.2-4 -- Spec file cleanups. - -* Tue Sep 27 2016 Fabio Valentini - 0.4.0.2-3 -- Validate all .desktop files. - -* Mon Sep 19 2016 Fabio Valentini - 0.4.0.2-2 -- Spec file cosmetics. - -* Tue Sep 06 2016 Fabio Valentini - 0.4.0.2-1 -- Update to version 0.4.0.2. - -* Mon Aug 15 2016 Fabio Valentini - 0.4.0.1-1 -- Update to version 0.4.0.1. - -* Sun Aug 14 2016 Fabio Valentini - 0.4-1 -- Update to version 0.4. - - diff --git a/sources b/sources deleted file mode 100644 index 3eac542..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (maya-calendar-0.4.1.tar.gz) = 585b01f5afa593ae375592cabd5cdabf89668ffb483a13c80e5b134e392b35794637fa8f8205e0f11a26ea6c3d76fe43ff4f68a0e2018c5784f6a9ecb62cbc44