.gear/rules | 3 + .../tags/48f5a7c1e953f82ca8b100c324af3705e56aca66 | 6 + .gear/tags/list | 1 + contrib/redshift.spec | 6 +- po/fr.po | 2 +- redshift-geoclue-provider.patch | 14 ++ redshift.1 | 4 +- redshift.spec | 161 +++++++++++++++++++++ 8 files changed, 193 insertions(+), 4 deletions(-) diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000..30aa12f --- /dev/null +++ b/.gear/rules @@ -0,0 +1,3 @@ +tar: v@version@:. +diff: v@version@:. . +copy: *.patch diff --git a/.gear/tags/48f5a7c1e953f82ca8b100c324af3705e56aca66 b/.gear/tags/48f5a7c1e953f82ca8b100c324af3705e56aca66 new file mode 100644 index 0000000..08e1276 --- /dev/null +++ b/.gear/tags/48f5a7c1e953f82ca8b100c324af3705e56aca66 @@ -0,0 +1,6 @@ +object f83b005c3bab866129985f780c9669109d863725 +type commit +tag v1.11 +tagger Jon Lund Steffensen 1451776564 -0500 + +Redshift 1.11 diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000..2f2ec02 --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +48f5a7c1e953f82ca8b100c324af3705e56aca66 v1.11 diff --git a/contrib/redshift.spec b/contrib/redshift.spec index cfb7af3..7159c1e 100644 --- a/contrib/redshift.spec +++ b/contrib/redshift.spec @@ -1,5 +1,5 @@ Name: redshift -Version: 1.10 +Version: 1.11 Release: 1%{dist} Summary: Adjusts the color temperature of your screen according to time of day Group: Applications/System @@ -78,10 +78,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_bindir}/redshift-gtk %{python3_sitelib}/redshift_gtk/ %{_datadir}/icons/hicolor/scalable/apps/redshift*.svg +%{_datadir}/applications/redshift.desktop %{_datadir}/applications/redshift-gtk.desktop %{_datadir}/appdata/redshift-gtk.appdata.xml %changelog +* Sat Jan 2 2016 Jon Lund Steffensen - 1.11-1 +- Update to 1.11 + * Sun Jan 4 2015 Jon Lund Steffensen - 1.10-1 - Update to 1.10 diff --git a/po/fr.po b/po/fr.po index 03fedb5..7471e3d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -190,7 +190,7 @@ msgstr "" " -p \t \t Mode d'impression (Impression des paramètres et fermeture)\n" " -x \t \t Mode de réinitialisation (Supprimer les réglages de l'écran)\n" " -r \t \t Désactiver les transitions de température\n" -" -t JOUR/NUIT \t Température des couleurs à appliquer le jour / la nuit\n" +" -t JOUR:NUIT \t Température des couleurs à appliquer le jour / la nuit\n" #. TRANSLATORS: help output 5 #: ../src/redshift.c:492 diff --git a/redshift-geoclue-provider.patch b/redshift-geoclue-provider.patch new file mode 100644 index 0000000..0de08e3 --- /dev/null +++ b/redshift-geoclue-provider.patch @@ -0,0 +1,14 @@ +diff -ur redshift-1.7/src/location-geoclue.c redshift-1.7_geoclue_provider/src/location-geoclue.c +--- redshift-1.7/src/location-geoclue.c 2011-03-27 23:13:10.000000000 +0100 ++++ redshift-1.7_geoclue_provider/src/location-geoclue.c 2011-07-09 13:41:17.940812241 +0100 +@@ -32,8 +32,8 @@ + # define _(s) s + #endif + +-#define DEFAULT_PROVIDER "org.freedesktop.Geoclue.Providers.UbuntuGeoIP" +-#define DEFAULT_PROVIDER_PATH "/org/freedesktop/Geoclue/Providers/UbuntuGeoIP" ++#define DEFAULT_PROVIDER "org.freedesktop.Geoclue.Providers.Hostip" ++#define DEFAULT_PROVIDER_PATH "/org/freedesktop/Geoclue/Providers/Hostip" + + int + location_geoclue_init(location_geoclue_state_t *state) diff --git a/redshift.1 b/redshift.1 index 607152e..9064eea 100644 --- a/redshift.1 +++ b/redshift.1 @@ -17,7 +17,7 @@ twilight and early morning, the color temperature transitions smoothly from night to daytime temperature to allow your eyes to slowly adapt over a period of about an hour. At night the color temperature should be set to match the lamps in your room. This is typically a low -temperature at around 3000K\-4000K (default is 3700K). During the day, +temperature at around 3000K\-4000K (default is 3500K). During the day, the color temperature should match the light from outside, typically around 5500K\-6500K (default is 5500K). The light has a higher temperature on an overcast day. @@ -80,7 +80,7 @@ more red light. Default temperature values: .IP -Daytime: 5500K, night: 3700K +Daytime: 5500K, night: 3500K .SH CONFIGURATION FILE A configuration file with the name `redshift.conf' can optionally be placed in `~/.config/'. The file has standard INI format. General diff --git a/redshift.spec b/redshift.spec new file mode 100644 index 0000000..6680219 --- /dev/null +++ b/redshift.spec @@ -0,0 +1,161 @@ +%define _libexecdir %_prefix/libexec +%def_enable drm +%def_enable randr +%def_enable vidmode +%def_enable gui + +Name: redshift +Version: 1.11 +Release: alt3 + +Summary: Redshift adjusts the color temperature of your screen +Summary(ru_RU.UTF-8): Redshift изменяет температуру цвета вашего экрана для снижения утомляемости глаз +Group: Graphical desktop/GNOME +License: GPLv3+ +Url: http://jonls.dk/redshift + +#VCS: https://github.com/jonls/redshift.git +#Source: https://github.com/jonls/%name/releases/download/v%version/%name-%version.tar.xz +Source: %name-%version.tar +Patch: %name-%version-%release.patch +Patch1: %name-geoclue-provider.patch + +Requires: geoclue2 +Requires: typelib(Gtk) = 3.0 + +# use python3 +AutoReqProv: nopython +%define __python %nil + +%{?_enable_gui:BuildRequires(pre): rpm-build-python3} +BuildRequires(pre): rpm-build-gir +%{?_enable_drm:BuildRequires: libdrm-devel} +%{?_enable_randr:BuildRequires: libxcb-devel} +%{?_enable_vidmode:BuildRequires: libXxf86vm-devel libXrandr-devel} +BuildRequires: libgio-devel geoclue2-devel +BuildRequires: systemd-devel intltool + +# libaptindicator is not package in ALT Linux +%add_typelib_req_skiplist typelib(AppIndicator3) + +%description +Redshift adjusts the color temperature of your screen according to your +surroundings. This may help your eyes hurt less if you are working in +front of the screen at night. The color temperature is set according to +the position of the sun. A different color temperature is set during +night and daytime. During twilight and early morning, the color +temperature transitions smoothly from night to daytime temperature to +allow your eyes to slowly adapt. + +%description -l ru_RU.UTF-8 +Redshift изменяет температуру цвета экрана вашего компьютера. Это может +снизить утомляемость глаз, особенно если вы работаете за компьютером +ночью. Температура цвета устанавливается в зависимости от позиции солнца +на небе (определяется на основе географических координат) и текущего +времени суток. Изменение температуры цвета происходит плавно, давая Вашим +глазам время на адаптацию. + +%prep +%setup +%patch -p1 +%patch1 -p1 +%autoreconf + +%build +%configure \ + %{subst_enable drm} \ + %{subst_enable randr} \ + %{subst_enable vidmode} \ + %{subst_enable gui} +%make_build + +%install +%makeinstall_std +%find_lang %name + +%files -f %name.lang +%_bindir/%name +%_prefix/lib/systemd/user/%name.service +%_desktopdir/%name.desktop +%_man1dir/%name.1.* + +%if_enabled gui +%_bindir/%name-gtk +%_prefix/lib/systemd/user/%name-gtk.service +%python3_sitelibdir_noarch/%{name}_gtk/ +%_desktopdir/%name-gtk.desktop +%_iconsdir/hicolor/*/*/*.* +%_datadir/appdata/%name-gtk.appdata.xml +%endif + +%doc DESIGN NEWS* README* redshift.conf.sample + +%changelog +* Thu Dec 07 2017 Yuri N. Sedunov 1.11-alt3 +- explicitly required typelib(Gtk) = 3.0 (ALT #34289) + +* Mon Mar 14 2016 Ivan Zakharyaschev 1.11-alt2.1 +- (NMU) rebuild with rpm-build-python3-0.1.9 + (for common python3/site-packages/ and auto python3.3-ABI dep when needed) + +* Mon Feb 15 2016 Yuri N. Sedunov 1.11-alt2 +- some improvements & cleanups + +* Sat Feb 13 2016 Andrey Cherepanov 1.11-alt1 +- New version + +* Wed May 06 2015 Yuri N. Sedunov 1.10-alt3 +- truly built with geoclue2 + +* Tue Mar 24 2015 Andrey Cherepanov 1.10-alt2 +- Build with drm and geoclue2 +- Package redshift-gtk.appdata.xml +- Reduce required autoconf version + +* Tue Feb 10 2015 Andrey Cherepanov 1.10-alt1 +- New version + +* Tue Apr 29 2014 Andrey Cherepanov 1.9.1-alt1 +- New version + +* Thu Dec 05 2013 Andrey Cherepanov 1.8-alt1 +- New version + +* Wed Jul 31 2013 Andrey Cherepanov 1.7-alt1 +- New version + +* Thu Apr 11 2013 Andrey Cherepanov 1.6-alt3.2 +- Remove requires of deprecated gnome-panel + +* Sat Oct 22 2011 Vitaly Kuznetsov 1.6-alt3.1 +- Rebuild with Python-2.7 + +* Sat Nov 12 2010 Anton Chernyshov 1.6-alt3 +- remove unneeded stuff from spec +- remove linking with .la-files (and create patch for this) + +* Mon Oct 18 2010 Anton Chernyshov 1.6-alt2 +- minor spec modifications +- exclude license from package according to distribution policy +- include man page + +* Mon Oct 18 2010 Anton Chernyshov 1.6-alt1 +- new upstream release +- completely translate this release to Russian language +- added new BuildReq dependencies + +* Sat Oct 16 2010 Anton Chernyshov 1.5-alt3.1 +- completely translate program to Russian language + +* Thu Oct 14 2010 Anton Chernyshov 1.5-alt3 +- adding some configure settings +- reformed and corrected Russian translation files + +* Mon Oct 11 2010 Anton Chernyshov 1.5-alt2.1 +- some minor spec changes + +* Tue Oct 7 2010 Anton Chernyshov 1.5-alt2 +- fix up spec-file according to Sisyphus requirements + +* Wed Oct 6 2010 Anton Chernyshov 1.5-alt1 +- create (more or less) generic spec file and initial build...