rpms/gnome-activity-journal/F-13 gnome-activity-journal-0.3.3-install-fixes.patch, NONE, 1.1 gnome-activity-journal-non-executable-script-fix.patch, NONE, 1.1 gnome-activity-journal.sh, NONE, 1.1 gnome-activity-journal.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Tue Mar 23 20:25:50 UTC 2010

Author: maxx

Update of /cvs/pkgs/rpms/gnome-activity-journal/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9898

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-activity-journal-0.3.3-install-fixes.patch 
	gnome-activity-journal-non-executable-script-fix.patch 
	gnome-activity-journal.sh gnome-activity-journal.spec 
Log Message:
* Sun Feb 21 2010 Mads Villadsen <maxx at krakoa.dk> - 0.3.3-1
- Update to new release
- Added a patch for better installation
- spec file updated to handle GConf schema, icons, languages, more
- Add intltool to BuildRequires


gnome-activity-journal-0.3.3-install-fixes.patch:
 extra/gnome-activity-journal.desktop.in |    2 +-
 gnome-activity-journal.sh               |    6 ++++++
 setup.cfg                               |    2 +-
 setup.py                                |   29 ++++++++++++-----------------
 4 files changed, 20 insertions(+), 19 deletions(-)

--- NEW FILE gnome-activity-journal-0.3.3-install-fixes.patch ---
diff -N -r -u gnome-activity-journal-0.3.3/extra/gnome-activity-journal.desktop.in gnome-activity-journal-0.3.3.install-fixes/extra/gnome-activity-journal.desktop.in
--- gnome-activity-journal-0.3.3/extra/gnome-activity-journal.desktop.in	2010-02-09 01:40:55.000000000 +0100
+++ gnome-activity-journal-0.3.3.install-fixes/extra/gnome-activity-journal.desktop.in	2010-02-26 07:06:55.459328363 +0100
@@ -3,6 +3,6 @@
 _Name=Activity Journal
 _GenericName=Activity Journal
 _Comment=Browse a chronological log of your activities and easily find files, contacts, etc.
-Exec=gnome-activity-journal
+Exec=gnome-activity-journal.sh
 Icon=gnome-activity-journal
 Categories=GTK;Utility;
diff -N -r -u gnome-activity-journal-0.3.3/gnome-activity-journal.sh gnome-activity-journal-0.3.3.install-fixes/gnome-activity-journal.sh
--- gnome-activity-journal-0.3.3/gnome-activity-journal.sh	1970-01-01 01:00:00.000000000 +0100
+++ gnome-activity-journal-0.3.3.install-fixes/gnome-activity-journal.sh	2010-02-26 07:06:17.537077995 +0100
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+PREFIX=/usr
+GAJDIR=share/gnome-activity-journal
+
+exec $PREFIX/$GAJDIR/gnome-activity-journal
\ No newline at end of file
diff -N -r -u gnome-activity-journal-0.3.3/setup.cfg gnome-activity-journal-0.3.3.install-fixes/setup.cfg
--- gnome-activity-journal-0.3.3/setup.cfg	2010-02-09 01:40:55.000000000 +0100
+++ gnome-activity-journal-0.3.3.install-fixes/setup.cfg	2010-02-25 23:16:26.118563303 +0100
@@ -2,4 +2,4 @@
 domain=gnome-activity-journal
 bug_contact=zeitgeist at lists.launchpad.net
 desktop_files=[('share/applications', ('extra/gnome-activity-journal.desktop.in',))]
-schemas_files=[('share/gconf/schemas', ('extra/gnome-activity-journal.schemas.in',))]
+schemas_files=[('etc/gconf/schemas', ('extra/gnome-activity-journal.schemas.in',))]
diff -N -r -u gnome-activity-journal-0.3.3/setup.py gnome-activity-journal-0.3.3.install-fixes/setup.py
--- gnome-activity-journal-0.3.3/setup.py	2010-02-21 01:41:25.000000000 +0100
+++ gnome-activity-journal-0.3.3.install-fixes/setup.py	2010-02-26 07:07:13.550077150 +0100
@@ -46,22 +46,6 @@
         else:
             self._destdir = self.prefix
         orig_install.run(self)
-        # Ensure the needed directories exist
-        self._create_directory('bin')
-        self._create_directory('share/pixmaps')
-        # Create a symlink for the executable file
-        self._create_symlink(
-            'share/gnome-activity-journal/gnome-activity-journal',
-            'bin/gnome-activity-journal')
-        # Symlink the 48x48 PNG icon into share/pixmaps
-        self._create_symlink(
-            'share/gnome-activity-journal/data/icons/hicolor/48x48/apps/' \
-                'gnome-activity-journal.png',
-            'share/pixmaps/gnome-activity-journal.png')
-        # Symlink the icons so that the Journal can find them
-        self._create_symlink(
-            'share/icons/',
-            'share/gnome-activity-journal/data/icons')
 
 class _build_i18n(build_i18n.build_i18n):
 
@@ -116,9 +100,20 @@
     license = 'GPLv3+',
     platforms = ['GNU/Linux'],
     data_files = list_from_lists(
-        [('share/gnome-activity-journal', ['gnome-activity-journal'])],
+        [('bin/', ['gnome-activity-journal.sh'])],
+        [('share/gnome-activity-journal/', ['gnome-activity-journal'])],
         [('share/gnome-activity-journal/data', glob('data/*.svg'))],
+        [('share/gnome-activity-journal/data/zlogo', glob('data/zlogo/*.png'))],
+
         [('share/pixmaps/', ['data/gnome-activity-journal.xpm'])],
+        [('share/pixmaps/', ['data/icons/hicolor/48x48/apps/gnome-activity-journal.png'])],
+
+        [('share/applications/', ['build/share/applications/gnome-activity-journal.desktop'])],
+        recursive_install('share/locale', 'build/mo/', '',
+            ext=['.mo']),
+        # gconf schemas can apparently not be easily installed using distutils
+        #[('etc/gconf/schemas/', ['build/etc/gconf/schemas/gnome-activity-journal.schemas'])],
+
         recursive_install('share/icons/hicolor', 'data/icons/hicolor/', '',
             ext=['.png', '.svg']),
         recursive_install('share/gnome-activity-journal', 'src/', ext=['.py']),

gnome-activity-journal-non-executable-script-fix.patch:
 config.py |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE gnome-activity-journal-non-executable-script-fix.patch ---
diff -r -u gnome-activity-journal-0.3.2/src/config.py gnome-activity-journal-0.3.2.fix_install/src/config.py
--- gnome-activity-journal-0.3.2/src/config.py	2010-01-19 16:15:00.000000000 +0100
+++ gnome-activity-journal-0.3.2.fix_install/src/config.py	2010-01-22 20:14:26.201932163 +0100
@@ -1,4 +1,3 @@
-#! /usr/bin/env python
 # -.- coding: utf-8 -.-
 #
 # GNOME Activity Journal


--- NEW FILE gnome-activity-journal.sh ---
#!/bin/bash
# A small script to execute gnome-activity-journal

PREFIX=/usr
GAJDIR=share/gnome-activity-journal

exec $PREFIX/$GAJDIR/gnome-activity-journal


--- NEW FILE gnome-activity-journal.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           gnome-activity-journal
Version:        0.3.3
Release:        1%{?dist}
Summary:        Browse and search your Zeitgeist activities

Group:          Applications/File
License:        GPLv3+
URL:            https://launchpad.net/%{name}
Source0:        http://launchpad.net/%{name}/0.3/%{version}/+download/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Patch to try to get setup.py to make a better installation.
# Has been submitted to the gnome-activity-journal for comments.
Patch0:         %{name}-0.3.3-install-fixes.patch
# Simple patch to get rid of rpmlint error about non-executable script
Patch1:         %{name}-non-executable-script-fix.patch

BuildArch:      noarch
BuildRequires:  python-devel python-distutils-extra desktop-file-utils intltool
Requires:       zeitgeist
Requires:       hicolor-icon-theme
Requires:       pygtk2 pygobject2
Requires:       gnome-python2-gnome gnome-python2-gconf pycairo
Requires:       pyxdg python-pygments

Requires(pre):   GConf2
Requires(post):  GConf2
Requires(preun): GConf2

%pre
# From https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#GConf
if [ "$1" -gt 1 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    gconftool-2 --makefile-uninstall-rule \
      %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
fi

%post
# From https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Icon_Cache
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

# From https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#GConf
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
  %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :

%preun
# From https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#GConf
if [ "$1" -eq 0 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    gconftool-2 --makefile-uninstall-rule \
      %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
fi

%postun
# From https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Icon_Cache
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
# From https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Icon_Cache
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%description
GNOME Activity Journal is a tool for easily
browsing and finding files on your computer.
It shows a chronological journal of all file
activity.

%prep
%setup -q
%patch0 -p1
%patch1 -p1

%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

# The gconf schema file doesn't get installed by setup.py so we do it by hand here
%{__install} -Dp -m0644 build/etc/gconf/schemas/%{name}.schemas \
    %{buildroot}%{_sysconfdir}/gconf/schemas/%{name}.schemas

%find_lang %{name}
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop

# Make sure the bin script is executable
chmod 755 %{buildroot}/%{_bindir}/%{name}.sh

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README PKG-INFO AUTHORS
%{_bindir}/*
%{_datadir}/gnome-activity-journal
%{_datadir}/icons/hicolor/*/*
%{_datadir}/pixmaps/*
%{_datadir}/applications/*
%{_datadir}/man/*/*
%{python_sitelib}/*

%{_sysconfdir}/gconf/schemas/%{name}.schemas

%changelog
* Sun Feb 21 2010 Mads Villadsen <maxx at krakoa.dk> - 0.3.3-1
- Update to new release
- Added a patch for better installation
- spec file updated to handle GConf schema, icons, languages, more
- Add intltool to BuildRequires

* Fri Jan 22 2010 Mads Villadsen <maxx at krakoa.dk> - 0.3.2-1
- Initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-activity-journal/F-13/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Feb 2010 17:54:45 -0000	1.1
+++ .cvsignore	23 Mar 2010 20:25:50 -0000	1.2
@@ -0,0 +1 @@
+gnome-activity-journal-0.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-activity-journal/F-13/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Feb 2010 17:54:46 -0000	1.1
+++ sources	23 Mar 2010 20:25:50 -0000	1.2
@@ -0,0 +1 @@
+5e360405224a54232c9c094c26c63721  gnome-activity-journal-0.3.3.tar.gz

