[EekBoek] Upgrade to upstream 2.02.00.

[Johan Vromans]

commit 78e9f655fdfb62348bcd94e5f3b1ed1f108ca707
Author: Johan Vromans <jvromans at squirrel.nl>
Date:   Fri Sep 21 21:56:06 2012 +0200

    Upgrade to upstream 2.02.00.

 .gitignore   |    1 +
 EekBoek.spec |   43 ++++++++++++++++++-------------------------
 2 files changed, 19 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6b0b262..004251d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 EekBoek-2.00.02.tar.gz
 /EekBoek-2.00.03.tar.gz
 /EekBoek-2.00.04.tar.gz
+/EekBoek-2.02.00.tar.gz
diff --git a/EekBoek.spec b/EekBoek.spec
index 463cece..b88b6ea 100644
--- a/EekBoek.spec
+++ b/EekBoek.spec
@@ -10,8 +10,8 @@ Name: EekBoek
 Summary: Bookkeeping software for small and medium-size businesses
 License: GPL+ or Artistic
 Group: Applications/Productivity
-Version: 2.00.04
-Release: 2%{?dist}
+Version: 2.02.00
+Release: 1%{?dist}
 Source: http://www.eekboek.nl/dl/%{name}-%{version}.tar.gz
 URL: http://www.eekboek.nl
 BuildRoot: %{_tmppath}/rpm-buildroot-%{name}-%{version}-%{release}
@@ -85,7 +85,6 @@ AutoReqProv: 0
 
 Requires: %{name} = %{version}-%{release}
 Requires: perl(Wx) >= 0.89
-Requires: perl(Wx::Perl::ProcessStream) >= 0.11
 Requires: wxGTK >= 2.8.8
 Requires: gettext
 
@@ -96,8 +95,8 @@ This package contains the wxWidgets (GUI) extension for %{name}.
 
 # This package only contains the necessary module(s) for EekBoek
 # to use the PostgreSQL database.
-# Installing this package will pull in the core package and
-# the Perl PostgreSQL modules.
+# Installing this package will pull in the main package and
+# the Perl PostgreSQL modules, if necessary.
 # No %%doc required.
 
 Summary: PostgreSQL database driver for %{name}
@@ -121,7 +120,6 @@ chmod 0664 MANIFEST
 
 # Remove some library modules since we Require them.
 %{__rm} -fr lib/EB/CPAN/Carp
-%{__rm} -fr lib/EB/CPAN/File
 %{__rm} -fr lib/EB/CPAN/Wx
 %{__perl} -ni~ -e 'print unless m;^lib/EB/CPAN/;;' MANIFEST
 
@@ -130,13 +128,8 @@ chmod 0664 MANIFEST
 %{__perl} Build
 
 # Move some files into better places.
-mv blib/lib/EB/examples .
-( cd examples;
-  %{__mv} ../eekboek-mode.el .;
-  %{__rm} -f ../blib/lib/EB/schema/sampledb.ebz;
-  ( echo "Dataset sampledb.ebz aangemaakt door rpmbuild EekBoek %{version}"
-    echo "Omschrijving: EekBoek voorbeeldadministratie" ) |
-  %{__zip} -qz ../blib/lib/EB/schema/sampledb.ebz *.eb schema.dat )
+%{__mkdir} examples
+%{__mv} emacs/eekboek-mode.el examples
 
 %install
 %{__rm} -rf %{buildroot}
@@ -150,17 +143,17 @@ mv blib/lib/EB/examples .
 %{__mkdir_p} %{buildroot}%{_bindir}
 
 # Install the default, system-wide config file.
-%{__install} -p -m 0644 examples/%{lcname}.conf %{buildroot}%{ebconf}/%{lcname}.conf
+%{__install} -p -m 0644 blib/lib/EB/examples/%{lcname}.conf %{buildroot}%{ebconf}/%{lcname}.conf
 
 # Install locales.
-for lang in blib/lib/EB/mo/*
+for lang in blib/lib/EB/res/locale/*
 do
   l=`basename ${lang}`
   %{__mkdir_p} %{buildroot}%{_datadir}/locale/${l}/LC_MESSAGES
-  %{__mv} blib/lib/EB/mo/${l}/* %{buildroot}%{_datadir}/locale/${l}/LC_MESSAGES
-  %{__rmdir} blib/lib/EB/mo/${l}
+  %{__mv} blib/lib/EB/res/locale/${l}/* %{buildroot}%{_datadir}/locale/${l}/LC_MESSAGES
+  %{__rmdir} blib/lib/EB/res/locale/${l}
 done
-%{__rmdir} blib/lib/EB/mo
+%{__rmdir} blib/lib/EB/res/locale
 
 # Create lib dirs and copy files.
 %{__find} blib/lib -type d -printf "%{__mkdir} %{buildroot}%{ebshare}/lib/%%P\n" | sh -x
@@ -179,20 +172,17 @@ do
   %{__mkdir_p} %{buildroot}%{_mandir}/man1
   pod2man blib/script/${script} > %{buildroot}%{_mandir}/man1/${script}.1
 
-  # And the localisations.
-  # %find_lang ${script}
-
 done
 
 # Handle localisations separately since we are not complete yet.
-for script in ebwxshell
+for script in ebcore
 do
   %find_lang ${script}
 done
 
 # Desktop file, icons, ...
 %{__mkdir_p} %{buildroot}%{_datadir}/pixmaps
-%{__install} -p -m 0664 lib/EB/Wx/icons/ebicon.png %{buildroot}%{_datadir}/pixmaps/
+%{__install} -p -m 0664 lib/EB/res/Wx/icons/ebicon.png %{buildroot}%{_datadir}/pixmaps/
 for script in ebwxshell
 do
   desktop-file-install --delete-original \
@@ -212,7 +202,7 @@ done
 %clean
 %{__rm} -rf %{buildroot}
 
-%files
+%files -f ebcore.lang
 %defattr(-,root,root,-)
 %doc CHANGES README examples/ doc/html/ TODO
 %dir %{_sysconfdir}/%{lcname}
@@ -223,7 +213,7 @@ done
 %{_bindir}/ebshell
 %{_mandir}/man1/ebshell*
 
-%files -f ebwxshell.lang gui
+%files gui
 %defattr(-,root,root,-)
 %doc README.gui
 %{ebshare}/lib/EB/Wx
@@ -238,6 +228,9 @@ done
 %{ebshare}/lib/EB/DB/Postgres.pm
 
 %changelog
+* Fri Sep 21 2012 Johan Vromans <jvromans at squirrel.nl> - 2.02.00-1
+- Upgrade to upstream 2.02.00.
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.00.04-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild