rpms/Zim/devel .cvsignore, 1.11, 1.12 Zim.spec, 1.18, 1.19 sources, 1.11, 1.12

Mon Jun 14 06:25:41 UTC 2010

Author: cheeselee

Update of /cvs/pkgs/rpms/Zim/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31607

Modified Files:
	.cvsignore Zim.spec sources 
Log Message:
* Mon Jun 14 2010 Robin Lee <robinlee.sysu at gmail.com> - 0.47-1
- update to 0.47, upstream reimplementation with PyGTK
- remove vendor from the desktop entry file name
- License changed to 'GPLv2+ and LGPLv3+'
- remove BuildRoot tag
- clean some whitespaces



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Zim/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12

--- .cvsignore	10 Feb 2010 02:07:21 -0000	1.11
+++ .cvsignore	14 Jun 2010 06:25:40 -0000	1.12
@@ -1 +1 @@
-Zim-0.29.tar.gz
+zim-0.47.tar.gz


Index: Zim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Zim/devel/Zim.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- Zim.spec	2 Jun 2010 09:48:18 -0000	1.18
+++ Zim.spec	14 Jun 2010 06:25:40 -0000	1.19
@@ -1,107 +1,97 @@
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%endif
+
 Name:           Zim
-Version:        0.29
-Release:        2%{?dist}
+Version:        0.47
+Release:        1%{?dist}
 Summary:        Desktop wiki & notekeeper
 
 Group:          Applications/Editors
-License:        GPL+ or Artistic
-URL:            http://zim-wiki.org/ 
-Source0:        http://www.zim-wiki.org/downloads/Zim-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# The entire source code is GPLv2+ except ./zim/_lib/xdot.py which is LGPLv3+
+License:        GPLv2+ and LGPLv3+
+URL:            http://zim-wiki.org/
+Source0:        http://www.zim-wiki.org/downloads/zim-%{version}.tar.gz
 BuildArch:      noarch
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-
-# non-perl
-BuildRequires:  sed, desktop-file-utils
 
-# core
-BuildRequires:  perl(Test::More)
-BuildRequires:  perl(Test::Simple)
-# cpan
-BuildRequires:  perl(Module::Build)
-BuildRequires:  perl(File::BaseDir)
-BuildRequires:  perl(File::DesktopEntry)
-BuildRequires:  perl(File::MimeInfo) >= 0.12
-BuildRequires:  perl(Gtk2) >= 1.040
-BuildRequires:  perl(Gtk2::TrayIcon)
-BuildRequires:  perl(Gtk2::Spell)
-# test
-BuildRequires:  perl(Test::Pod)
-BuildRequires:  perl(Test::Pod::Coverage)
-# non-perl req for tests
-BuildRequires:  bzr, gettext, man
-
-# not picked up automatically
-Requires:       perl(Gtk2::TrayIcon)
-
-# non-perl requires -- for the InsertScreenshot plugin 
-Requires:       scrot
-Requires:       shared-mime-info
+BuildRequires:  desktop-file-utils
+BuildRequires:  python2-devel >= 2.5
+BuildRequires:  pygobject2
 
-%{?perl_default_filter}
+Requires:       pygtk2, pyxdg
 
 %description
-Zim is a WYSIWYG text editor written in Gtk2-Perl which aims to bring the
+Zim is a WYSIWYG text editor written in PyGTK which aims to bring the
 concept of a wiki to your desktop. Every page is saved as a text file with
 wiki markup. Pages can contain links to other pages, and are saved
 automatically. Creating a new page is as easy as linking to a non-existing
 page. Pages are ordered in a hierarchical structure that gives it the look
 and feel of an outliner. This tool is intended to keep track of TODO lists
-or to serve as a personal scratch book. 
-
+or to serve as a personal scratch book.
 
 %prep
-%setup -q
-
-find . -type f -exec chmod -c -x {} +
-#sed -i 's/\r//' share/zim/plugins/Subversion.pl
-
-# We're not running on Win32.  Really :)
-rm -f ./lib/Zim/OS/Win32.pm
-rmdir ./lib/Zim/OS
-
+%setup -q -n zim-%{version}
 
 %build
-%{__perl} Build.PL installdirs=vendor
-./Build
 
 
 %install
 rm -rf %{buildroot}
+./setup.py install --root=%{buildroot} --skip-xdg-cmd
 
-./Build install destdir=%{buildroot} create_packlist=0
-find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
-
-%{_fixperms} %{buildroot}/*
-
-desktop-file-install --vendor="fedora" --delete-original    \
-    --dir=%{buildroot}%{_datadir}/applications              \
+desktop-file-install --delete-original \
+    --dir=%{buildroot}%{_datadir}/applications \
      %{buildroot}%{_datadir}/applications/zim.desktop
 
+# remove shebangs in some module files
+sed -i -e '/^#!\//, 1d' %{buildroot}%{python_sitelib}/zim/_lib/xdot.py \
+                        %{buildroot}%{python_sitelib}/zim/_version.py
 
-%check
-# _still_ borked *sigh*
-%{?!_with_display_tests: rm t/[78][01]*.t }
-./Build test
+%find_lang zim
 
+%check
 
 %clean
 rm -rf %{buildroot}
 
+%post
+update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime/ &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime/ &> /dev/null || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
 
-%files
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%files -f zim.lang
 %defattr(-,root,root,-)
-%doc Changes contrib/ 
-%{perl_vendorlib}/*
+%doc LICENSE.txt CHANGELOG.txt README.txt contrib/
 %{_mandir}/man[13]/*.[13]*
 %{_bindir}/*
-%{_datadir}/zim
+%{_datadir}/zim/
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
 %{_datadir}/mime/packages/zim.xml
-
+%{_datadir}/icons/hicolor/64x64/apps/*
+%{_datadir}/icons/hicolor/64x64/mimetypes/*
+%{python_sitelib}/zim-*.egg-info
+%{python_sitelib}/zim/
 
 %changelog
+* Mon Jun 14 2010 Robin Lee <robinlee.sysu at gmail.com> - 0.47-1
+- update to 0.47, upstream reimplementation with PyGTK
+- remove vendor from the desktop entry file name
+- License changed to 'GPLv2+ and LGPLv3+'
+- remove BuildRoot tag
+- clean some whitespaces
+
 * Wed Jun 02 2010 Marcela Maslanova <mmaslano at redhat.com> - 0.29-2
 - Mass rebuild with perl-5.12.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Zim/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	10 Feb 2010 02:07:21 -0000	1.11
+++ sources	14 Jun 2010 06:25:40 -0000	1.12
@@ -1 +1 @@
-369a0641c6327d7f0d7f5175adcb56b4  Zim-0.29.tar.gz
+d688a5e4e779dbf13e8abf8b2893e7db  zim-0.47.tar.gz

