rpms/gnome-activity-journal/devel .cvsignore, 1.2, 1.3 gnome-activity-journal.spec, 1.1, 1.2 sources, 1.2, 1.3

[Mads Villadsen]

Author: maxx

Update of /cvs/pkgs/rpms/gnome-activity-journal/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2580

Modified Files:
	.cvsignore gnome-activity-journal.spec sources 
Log Message:
* Sun May  9 2010 Mads Villadsen <maxx at krakoa.dk> - 0.3.4-1
- Update to latest release
- Fixes bugs #579024, #579148, #579144, #580740, #580309, #591444
- Don't use --skip-build in install target as it breaks various part of the installation
- Removed the install patch as the installation is better behaved now
- Removed the startup shell script as it is no longer needed



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-activity-journal/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Mar 2010 20:37:06 -0000	1.2
+++ .cvsignore	13 May 2010 13:06:08 -0000	1.3
@@ -1 +1 @@
-gnome-activity-journal-0.3.3.tar.gz
+gnome-activity-journal-0.3.4.tar.gz


Index: gnome-activity-journal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-activity-journal/devel/gnome-activity-journal.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gnome-activity-journal.spec	23 Mar 2010 20:37:06 -0000	1.1
+++ gnome-activity-journal.spec	13 May 2010 13:06:08 -0000	1.2
@@ -1,7 +1,7 @@
 %{!?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
+Version:        0.3.4
 Release:        1%{?dist}
 Summary:        Browse and search your Zeitgeist activities
 
@@ -11,15 +11,12 @@ URL:            https://launchpad.net/%{
 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:       zeitgeist >= 0.3.1
 Requires:       hicolor-icon-theme
 Requires:       pygtk2 pygobject2
 Requires:       gnome-python2-gnome gnome-python2-gconf pycairo
@@ -73,7 +70,6 @@ activity.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 
 %build
@@ -82,18 +78,16 @@ activity.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --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
+# The gconf schema file gets installed in the wrong location so we move it
+mkdir -p %{buildroot}%{_sysconfdir}/gconf/schemas/
+mv %{buildroot}%{_datadir}/gconf/schemas/%{name}.schemas \
+   %{buildroot}%{_sysconfdir}/gconf/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
 
@@ -112,6 +106,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Sun May  9 2010 Mads Villadsen <maxx at krakoa.dk> - 0.3.4-1
+- Update to latest release
+- Fixes bugs #579024, #579148, #579144, #580740, #580309, #591444
+- Don't use --skip-build in install target as it breaks various part of the installation
+- Removed the install patch as the installation is better behaved now
+- Removed the startup shell script as it is no longer needed
+
 * Sun Feb 21 2010 Mads Villadsen <maxx at krakoa.dk> - 0.3.3-1
 - Update to new release
 - Added a patch for better installation


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-activity-journal/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Mar 2010 20:37:07 -0000	1.2
+++ sources	13 May 2010 13:06:08 -0000	1.3
@@ -1 +1 @@
-5e360405224a54232c9c094c26c63721  gnome-activity-journal-0.3.3.tar.gz
+0dfde0e489f8ffd7abb24f49cd970683  gnome-activity-journal-0.3.4.tar.gz