diff --git a/70-lunar-calendar.sh b/70-lunar-calendar.sh deleted file mode 100644 index 7002c95..0000000 --- a/70-lunar-calendar.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -if [ -z "$GTK3_MODULES" ] ; then - GTK3_MODULES="lunar-calendar-module" -else - GTK3_MODULES="$GTK3_MODULES:lunar-calendar-module" -fi - -export GTK3_MODULES diff --git a/lunar-calendar.csh b/lunar-calendar.csh new file mode 100644 index 0000000..5b6375a --- /dev/null +++ b/lunar-calendar.csh @@ -0,0 +1,5 @@ +if ( -f "/usr/lib64/gtk-3.0/modules/liblunar-calendar-module.so" ) then + if ( ! $?GTK3_MODULES ) set GTK3_MODULES="" + if ( $?GTK3_MODULES ) setenv GTK3_MODULES "$GTK3_MODULES\:" + setenv GTK3_MODULES "${GTK3_MODULES}lunar-calendar-module" +endif diff --git a/lunar-calendar.sh b/lunar-calendar.sh new file mode 100644 index 0000000..626d852 --- /dev/null +++ b/lunar-calendar.sh @@ -0,0 +1,3 @@ +if [ -f "/usr/lib64/gtk-3.0/modules/liblunar-calendar-module.so" ]; then + export GTK3_MODULES="${GTK3_MODULES:+$GTK3_MODULES:}lunar-calendar-module" +fi diff --git a/lunar-calendar.spec b/lunar-calendar.spec index 1fd2318..78defec 100644 --- a/lunar-calendar.spec +++ b/lunar-calendar.spec @@ -27,7 +27,8 @@ Group: System/I18n/Chinese Url: https://github.com/yetist/lunar-calendar # Source0: https://github.com/yetist/lunar-calendar/archive/v%{version}/%{name}-%{version}.tar.gz Source0: https://github.com/yetist/lunar-calendar/archive/%{commit}/%{name}-%{shortcommit}.tar.gz -Source1: 70-lunar-calendar.sh +Source1: %{name}.sh +Source2: %{name}.csh BuildRequires: fdupes BuildRequires: meson BuildRequires: pkgconfig(gio-2.0) @@ -37,6 +38,7 @@ BuildRequires: pkgconfig(gtk-doc) BuildRequires: pkgconfig(vapigen) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(lunar-date-3.0) +Requires: lib%{name}-3_0-%{sover} = %{version}-%{release} %description @@ -45,18 +47,21 @@ This is the traditional Chinese calendar application. %package -n lib%{name}-3_0-%{sover} Summary: The lunar-calendar libraries Group: System/Libraries -Requires: %{name} = %{version}-%{release} %description -n lib%{name}-3_0-%{sover} This package contains the libraries for lunar-calendar. %package gtk3-module Summary: The lunar-calendar libraries -- GTK+ 3 Module -Group: System/Libraries +Group: System/I18n/Chinese Requires: %{name} = %{version}-%{release} +Provides: locale(patterns-gnome-gnome:zh_CN;zh_SG;zh_TW;zh_HK) +Provides: locale(patterns-mate-mate:zh_CN;zh_SG;zh_TW;zh_HK) +Provides: locale(patterns-xfce-xfce:zh_CN;zh_SG;zh_TW;zh_HK) %description gtk3-module -This package contains a GTK+ 3 module of lunar-calendar. +This package contains a GTK+ 3 module of lunar-calendar. Calendar applications +base on GTK3 can display Chinese Lunar calendar by this module. %package -n typelib-1_0-LunarCalendar-3_0 Summary: Introspection bindings for lunar-calendar @@ -78,6 +83,7 @@ Documents for lunar-calendar %package devel Summary: Development tools for ibus Group: Development/Libraries/C and C++ +Requires: lib%{name}-3_0-%{sover} = %{version}-%{release} %description devel The lunar-calendar-devel package contains the header files and developer @@ -99,8 +105,9 @@ docs for lunar-calendar. %install %meson_install -install -d %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/ -install -m0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/ +install -d %{buildroot}%{_sysconfdir}/profile.d/ +install -m0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/ +install -m0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/ %fdupes %{buildroot} %find_lang %{name} @@ -111,15 +118,14 @@ install -m0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/ %files %defattr(-,root,root,-) -%doc AUTHORS NEWS README.md +%doc NEWS README.md %license COPYING %files gtk3-module %defattr(-,root,root,-) -%dir %{_sysconfdir}/X11/xinit -%dir %{_sysconfdir}/X11/xinit/xinitrc.d -%{_sysconfdir}/X11/xinit/xinitrc.d/70-lunar-calendar.sh %{_libdir}/gtk-3.0/modules/liblunar-calendar-module.so +%config %{_sysconfdir}/profile.d/%{name}.sh +%config %{_sysconfdir}/profile.d/%{name}.csh %files lang -f %{name}.lang