[dayplanner] New version.
Christopher Meng
cicku at fedoraproject.org
Wed Sep 4 09:46:37 UTC 2013
commit fda9c56985b98fec90568c16e0ee11648810815a
Author: Christopher Meng <rpm at cicku.me>
Date: Wed Sep 4 17:45:52 2013 +0800
New version.
.gitignore | 1 +
dayplanner.spec | 70 ++++++++++++++++++++----------------------------------
sources | 2 +-
3 files changed, 28 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 051184f..bab7878 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
dayplanner-0.10.tar.bz2
+/dayplanner-0.11.tar.bz2
diff --git a/dayplanner.spec b/dayplanner.spec
index b692d96..fdee8c7 100644
--- a/dayplanner.spec
+++ b/dayplanner.spec
@@ -1,23 +1,20 @@
-%define include_holidayparser 0
+%global include_holidayparser 0
%{?_with_holidayparser: %{expand: %%global include_holidayparser 1}}
Name: dayplanner
-Version: 0.10
-Release: 9%{?dist}
+Version: 0.11
+Release: 1%{?dist}
Summary: An easy and clean Day Planner
Summary(pl): Prosty i elegancki organizer
Summary(de): Ein einfacher und klarer Tagesplaner
-Group: Applications/Productivity
License: GPLv3+
-URL: http://www.day-planner.org/
-Source0: http://download.gna.org/dayplanner/%{name}-%{version}.tar.bz2
-Source1: holiday_japan
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL: http://www.day-planner.org
+Source0: https://github.com/downloads/zerodogg/%{name}/%{name}-%{version}.tar.bz2
BuildArch: noarch
BuildRequires: gettext desktop-file-utils perl
BuildRequires: perl(Locale::gettext)
%if 0%{?fedora} && 0%{?fedora} >= 19
-BuildRequires: perl-autodie
+BuildRequires: perl-autodie
%endif
Requires: hicolor-icon-theme
Requires: perl(Locale::gettext)
@@ -66,30 +63,26 @@ sed -e '/perl(Date::HolidayParser)/d'
EOF
%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
-chmod +x %{__perl_requires}
-
+chmod +x %{__perl_requires}
%build
# nothing to build
-
%install
-rm -rf $RPM_BUILD_ROOT
-
%if include_holidayparser
-make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} DHPinstall
+make install DESTDIR=%{buildroot} prefix=%{_prefix} DHPinstall
%else
-make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix}
+make install DESTDIR=%{buildroot} prefix=%{_prefix}
%endif
# Install hicolor icons
for size in 16 24 32 48; do
- mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps
- install -m 644 -p art/%{name}-${size}x${size}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/%{name}.png
+ mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps
+ install -pm644 art/%{name}-${size}x${size}.png %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/%{name}.png
done
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+rm -f %{buildroot}%{_datadir}/applications/%{name}.desktop
+rm -f %{buildroot}%{_datadir}/pixmaps/%{name}.png
# Install desktop file
desktop-file-install \
@@ -97,46 +90,33 @@ desktop-file-install \
--vendor="fedora" \
%endif
--remove-category=X-MandrivaLinux-Office-TimeManagement \
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+ --dir=%{buildroot}%{_datadir}/applications \
./doc/%{name}.desktop
-# Install holiday
-cp -pf %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/holiday
-
# Chmod
-find $RPM_BUILD_ROOT%{_datadir}/%{name} -name \*.pm -exec chmod 0644 {} \;
+find %{buildroot}%{_datadir}/%{name} -name \*.pm -exec chmod 0644 {} \;
# Find the localization
%find_lang %{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/update-desktop-database &> /dev/null || :
-
%postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%{_bindir}/update-desktop-database &> /dev/null || :
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f dayplanner.lang
-%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS THANKS TODO
%doc ./doc/{*_Spec,EnvironmentVariables,HACKING,README.*,TESTCASES,TODO_DPS}
-%{_bindir}/%{name}
-%{_bindir}/%{name}-daemon
-%{_bindir}/%{name}-notifier
+%{_bindir}/%{name}*
%{_datadir}/%{name}
%if 0%{?fedora} && 0%{?fedora} < 19
%{_datadir}/applications/fedora-%{name}.desktop
@@ -144,10 +124,12 @@ fi
%{_datadir}/applications/%{name}.desktop
%endif
%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
-%{_mandir}/man1/dayplanner*1.gz
-
+%{_mandir}/man1/dayplanner*.1*
%changelog
+* Tue Sep 03 2013 Christopher Meng <rpm at cicku.me> - 0.11-1
+- New version.
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 9893809..f6feb29 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-34c3bfb39e4dd1bc89384bdfb46c4169 dayplanner-0.10.tar.bz2
+f729eac0f42342f84756b73b49738d4a dayplanner-0.11.tar.bz2
More information about the scm-commits
mailing list