From 7128e632b43a5b1b40f498085e4d3432e3ab824d Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Feb 21 2012 01:27:22 +0000 Subject: New upstream. --- diff --git a/.gitignore b/.gitignore index cce086a..5162bcb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /timeline-0.14.0.zip +/timeline-0.16.0.zip diff --git a/sources b/sources index 61e77a9..8ee8d1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ff58a2c96305611194ebd6e9120d4381 timeline-0.14.0.zip +62ca8b9fa98ff8b2cc674a05ffbfc500 timeline-0.16.0.zip diff --git a/timeline-0.16.0-paths.patch b/timeline-0.16.0-paths.patch new file mode 100644 index 0000000..447b053 --- /dev/null +++ b/timeline-0.16.0-paths.patch @@ -0,0 +1,12 @@ +--- timelinelib/config/paths.py~ 2012-01-30 17:22:34.000000000 -0600 ++++ timelinelib/config/paths.py 2012-02-20 14:20:03.992039998 -0600 +@@ -19,7 +19,7 @@ + import os.path + + +-_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..")) ++_ROOT = "/usr/share/timeline/" + ICONS_DIR = os.path.join(_ROOT, "icons") +-LOCALE_DIR = os.path.join(_ROOT, "po") ++LOCALE_DIR = "/usr/share/locale" + HELP_RESOURCES_DIR = os.path.join(_ROOT, "help_resources") diff --git a/timeline.spec b/timeline.spec index 02755f2..c39a20a 100644 --- a/timeline.spec +++ b/timeline.spec @@ -1,8 +1,8 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} Name: timeline -Version: 0.14.0 -Release: 4%{?dist} +Version: 0.16.0 +Release: 1%{?dist} Summary: Displays and navigates events on a timeline Group: Applications/Productivity @@ -10,7 +10,7 @@ License: GPLv3 and CC-BY-SA URL: http://thetimelineproj.sourceforge.net/ Source0: http://downloads.sourceforge.net/thetimelineproj/%{name}-%{version}.zip Source1: timeline.desktop -Patch0: timeline-0.14.0-paths.patch +Patch0: timeline-0.16.0-paths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: desktop-file-utils @@ -43,15 +43,15 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/timeline install -m 755 timeline.py $RPM_BUILD_ROOT%{_bindir}/timeline -cp -pr help_resources $RPM_BUILD_ROOT%{_datadir}/timeline/ +#cp -pr help_resources $RPM_BUILD_ROOT%{_datadir}/timeline/ cp -pr icons $RPM_BUILD_ROOT%{_datadir}/timeline/ cp -pr libs $RPM_BUILD_ROOT%{_datadir}/timeline/ mkdir -p $RPM_BUILD_ROOT%{python_sitelib}/timelinelib cp -pr timelinelib/* $RPM_BUILD_ROOT%{python_sitelib}/timelinelib/ -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -cp -pr man/man1/timeline.1 $RPM_BUILD_ROOT%{_mandir}/man1/ +#mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 +#cp -pr man/man1/timeline.1 $RPM_BUILD_ROOT%{_mandir}/man1/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps install -p -m 644 icons/48.png \ @@ -88,9 +88,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/timeline.desktop %{_datadir}/icons/hicolor/48x48/apps/timeline.png %{python_sitelib}/timelinelib* -%{_mandir}/man1/timeline.1.gz +#%{_mandir}/man1/timeline.1.gz %changelog +* Mon Feb 20 2012 Jon Ciesla - 0.16.0-1 +- New upstream. + * Sat Jan 14 2012 Fedora Release Engineering - 0.14.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild