rpms/gjots2/devel gjots2-2.3.4-sitelib.patch, NONE, 1.1 gjots2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Radek Vokál (rvokal) fedora-extras-commits at redhat.com
Mon Apr 3 05:58:57 UTC 2006 

Author: rvokal

Update of /cvs/extras/rpms/gjots2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28048/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gjots2-2.3.4-sitelib.patch gjots2.spec 
Log Message:
auto-import gjots2-2.3.4-4 on branch devel from gjots2-2.3.4-4.src.rpm

gjots2-2.3.4-sitelib.patch:

--- NEW FILE gjots2-2.3.4-sitelib.patch ---
--- gjots2-2.3.4/bin/gjots2.lib	2005-12-24 09:02:42.000000000 +0100
+++ gjots2-2.3.4/bin/gjots2	2006-03-28 16:16:13.000000000 +0200
@@ -3,6 +3,7 @@
 import sys, os, getopt
 import gettext
 gettext.install('gjots2', '/usr/share/locale')
+from distutils.sysconfig import get_python_lib
 
 def ver2str(ver):
     return ".".join(map(str,ver))
@@ -63,7 +64,7 @@
 	else:
 		# Assumption: we're running from $prefix/bin
 		prefix, bin = os.path.split(dirName)
-		sys.path = [ prefix + '/lib/gjots2' ] + sys.path
+		sys.path = [ get_python_lib() + '/gjots2' ] + sys.path
 
 	from gui import *
 	from version import *


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

# $Id: gjots2.spec,v 1.12.2.12 2006/01/23 17:26:14 bhepple Exp $
#   Copyright (C) 2002-2005 Robert Hepple 
#
#   This program is free software; you can redistribute it and/or
#   modify it under the terms of the GNU General Public License as
#   published by the Free Software Foundation; either version 2 of the
#   License, or (at your option) any later version.
#
#   This program is distributed in the hope that it will be useful, but
#   WITHOUT ANY WARRANTY; without even the implied warranty of
#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
#   General Public License for more details.
#
#   You should have received a copy of the GNU General Public License
#   along with this program; if not, write to the Free Software
#   Foundation, Inc., 59 Temple Place - Suite 330, Boston,
#   MA 02111-1307, USA.

%define ver 2.3.4
%define rel 4

Summary: A note jotter - Organise your ideas, notes, facts in a hierarchy
Name: gjots2
Version: %{ver}
Release: %{rel}%{?dist}
URL: http://bhepple.freeshell.org/gjots
Source: http://bhepple.freeshell.org/gjots/%{name}-%{version}.tgz
Patch0: gjots2-2.3.4-sitelib.patch
License: GPL
Group: Applications/Productivity
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: desktop-file-utils

Requires: python >= 2.3, pygtk2 >= 2.4.0, gnome-python2 >= 2.0.2
Requires: libglade2 >= 2.4, gnome-python2-gconf >= 2.6.0

%description

gjots2 ("gee-jots" or, if you prefer, "gyachts"!) is a way to marshall
and organise your text notes in a convenient, hierachical way. I use
it for all my notes on Unix, my personal bits and pieces, recipes and
even PINs and passwords (encrypted with ccrypt(1)).

You can also use it to "mind-map" your compositions - write down all
your thoughts and then start to organise them into a tree. By
manipulating the tree you can easily reorder your thoughts and
structure them appropriately.

%prep
%setup -q
%patch0 -p1 -b .lib

iconv -f iso-8859-1 -t utf-8 -o man.tmp share/man/man1/docbook2gjots.1 && mv man.tmp share/man/man1/docbook2gjots.1
iconv -f iso-8859-1 -t utf-8 -o man.tmp share/man/man1/gjots2docbook.1 && mv man.tmp share/man/man1/gjots2docbook.1
iconv -f iso-8859-1 -t utf-8 -o man.tmp share/man/man1/gjots2html.1 && mv man.tmp share/man/man1/gjots2html.1

%build
%install

# typically:
#	buildroot=/var/tmp/root-gjots2-2.3.4
#	_datadir=/usr/share
#	_bindir=/usr/bin
#	_libdir=/usr/lib

%{__rm} -rf %{buildroot}
%{__install} -d -m0755  \
                        %{buildroot}%{_datadir}/applications \
                        %{buildroot}%{_datadir}/%{name} \
                        %{buildroot}%{_datadir}/pixmaps \
                        %{buildroot}%{_datadir}/man/man1 \
                        %{buildroot}%{python_sitelib}/%{name} \
                        %{buildroot}%{_bindir} \
						%{buildroot}%{_datadir}/locale/en_US/LC_MESSAGES \
						%{buildroot}%{_datadir}/locale/fr/LC_MESSAGES \
						%{buildroot}%{_datadir}/locale/no/LC_MESSAGES \
						%{buildroot}%{_datadir}/locale/nb/LC_MESSAGES \
						%{buildroot}%{_datadir}/locale/ru/LC_MESSAGES

%{__install} -m0755 bin/gjots2 bin/gjots2docbook bin/gjots2html bin/docbook2gjots %{buildroot}%{_bindir}/
%{__install} -m0644 lib/*.py %{buildroot}%{python_sitelib}/%{name}/
%{__install} -m0644 gjots.glade2 %{buildroot}%{_datadir}/%{name}
%{__install} -m0644 gjots.png %{buildroot}%{_datadir}/%{name}
%{__install} -m0644 gjots.png %{buildroot}%{_datadir}/pixmaps/
%{__install} -m0644 gjots2-hide-all.png %{buildroot}%{_datadir}/%{name}
%{__install} -m0644 gjots2-merge-items.png %{buildroot}%{_datadir}/%{name}
%{__install} -m0644 gjots2-new-child.png %{buildroot}%{_datadir}/%{name}
%{__install} -m0644 gjots2-new-page.png %{buildroot}%{_datadir}/%{name}
%{__install} -m0644 gjots2-show-all.png %{buildroot}%{_datadir}/%{name}
%{__install} -m0644 gjots2-split-item.png %{buildroot}%{_datadir}/%{name}
desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
                --add-category X-Fedora                         \
                        %{name}.desktop

%{__install} -m0644 share/man/man1/gjots2.1 %{buildroot}%{_datadir}/man/man1
%{__install} -m0644 share/man/man1/gjots2html.1 %{buildroot}%{_datadir}/man/man1
%{__install} -m0644 share/man/man1/gjots2docbook.1 %{buildroot}%{_datadir}/man/man1
%{__install} -m0644 share/man/man1/docbook2gjots.1 %{buildroot}%{_datadir}/man/man1
%{__install} -m0644 po/en_US/LC_MESSAGES/gjots2.mo %{buildroot}%{_datadir}/locale/en_US/LC_MESSAGES
%{__install} -m0644 po/fr/LC_MESSAGES/gjots2.mo %{buildroot}%{_datadir}/locale/fr/LC_MESSAGES
%{__install} -m0644 po/no/LC_MESSAGES/gjots2.mo %{buildroot}%{_datadir}/locale/no/LC_MESSAGES
%{__install} -m0644 po/nb/LC_MESSAGES/gjots2.mo %{buildroot}%{_datadir}/locale/nb/LC_MESSAGES
%{__install} -m0644 po/ru/LC_MESSAGES/gjots2.mo %{buildroot}%{_datadir}/locale/ru/LC_MESSAGES
%find_lang %{name}

%clean
%{__rm} -rf %{buildroot}


%files -f gjots2.lang
%defattr(-,root,root)
%doc AUTHORS INSTALL README COPYING ChangeLog gjots2.gjots gjots2.en_US.gjots gjots2.fr.gjots gjots2.nb.gjots gjots2.no.gjots gjots2.ru.gjots
%dir %{python_sitelib}/%{name}
%{python_sitelib}/%{name}/*.py
%{python_sitelib}/%{name}/*.pyc
%ghost %{python_sitelib}/%{name}/*.pyo
%{_bindir}/gjots2
%{_bindir}/gjots2html*
%{_bindir}/gjots2docbook
%{_bindir}/docbook2gjots
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%{_datadir}/pixmaps/gjots.png
%{_datadir}/applications/fedora-gjots2.desktop
%{_mandir}/man1/%{name}*
%{_mandir}/man1/docbook2gjots*

%changelog
* Thu Mar 30 2006 Radek Vokál <rvokal at redhat.com> 2.3.4-4
- BuildRequires: desktop-file-utils

* Tue Mar 28 2006 Radek Vokál <rvokal at redhat.com> 2.3.4-3
- move libs to python_sitelib

* Fri Mar 17 2006 Radek Vokál <rvokal at redhat.com> 2.3.4-2
- convert man pages to UTF-8
- add file list

* Wed Mar 15 2006 Radek Vokál <rvokal at redhat.com> 2.3.4-1
- initial build for Fedora Core


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gjots2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2006 05:57:10 -0000	1.1
+++ .cvsignore	3 Apr 2006 05:58:56 -0000	1.2
@@ -0,0 +1 @@
+gjots2-2.3.4.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gjots2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2006 05:57:10 -0000	1.1
+++ sources	3 Apr 2006 05:58:56 -0000	1.2
@@ -0,0 +1 @@
+ae05d1ea976de08dd9fc80faa04c558f  gjots2-2.3.4.tgz

More information about the fedora-extras-commits mailing list