- added DESTDIR and po patches, some build fixes, use find_lang

Changed files:
    emma.spec -> 1.12

diff --git a/emma.spec b/emma.spec
index 1cfc90e1ae73fc2f70d6052e52c928620856bea7..07a81cac3324a696f5becaca2597bb2c97d88fbf 100644 (file)
--- a/emma.spec
+++ b/emma.spec
@@ -2,18 +2,23 @@ Summary:      Money management program for Gnome/Gtk+
 Summary(pl):   Program do zarz±dzania pieniêdzmi
 Name:          emma
 Version:       0.8
 Summary(pl):   Program do zarz±dzania pieniêdzmi
 Name:          emma
 Version:       0.8

-Release:       0
+Release:       0.1

 License:       GPL
 Group:         Applications/Databases
 Source0:       http://rainbow.mimuw.edu.pl/~la181249/emma/download-count.php3?get=packages/%{name}-%{version}-1.tar.gz
 # Source0-md5: 7dc37a41b9fb2cfc69a3c1a3ac22f102
 License:       GPL
 Group:         Applications/Databases
 Source0:       http://rainbow.mimuw.edu.pl/~la181249/emma/download-count.php3?get=packages/%{name}-%{version}-1.tar.gz
 # Source0-md5: 7dc37a41b9fb2cfc69a3c1a3ac22f102

+Patch0:                %{name}-DESTDIR.patch
+Patch1:                %{name}-po.patch

 URL:           http://rainbow.mimuw.edu.pl/~la181249/
 URL:           http://rainbow.mimuw.edu.pl/~la181249/

-BuildRequires: python-devel >= 1.5
-BuildRequires: gtk+-devel >= 1.2.0
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: gettext-devel

 BuildRequires: gnome-libs-devel
 BuildRequires: gnome-libs-devel

+BuildRequires: gtk+-devel >= 1.2.0
+BuildRequires: libtool
+BuildRequires: python-devel >= 1.5

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 

-

 %description
 This program allows to easy manage your incomes and expenses. It is
 simple in design, but extensible through embeded python interface.
 %description
 This program allows to easy manage your incomes and expenses. It is
 simple in design, but extensible through embeded python interface.


@@ -27,23 +32,34 @@ wiedzie
 
 %prep
 %setup -q
 
 %prep
 %setup -q

+%patch0 -p1
+%patch1 -p1

 
 %build
 
 %build

-%configure2_13
+%{__gettextize}
+%{__libtoolize}
+%{__aclocal} -I macros
+%{__autoconf}
+%{__automake}
+%configure
+

 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT

-%{__make} prefix=$RPM_BUILD_ROOT%{_prefix} install
+
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT \
+       emma_desktopdir=%{_applnkdir}/Utilities
+
+%find_lang %{name} --with-gnome

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

-%files
+%files -f %{name}.lang

 %defattr(644,root,root,755)
 %defattr(644,root,root,755)

-%doc ChangeLog README COPYING
+%doc AUTHORS NEWS README TODO

 %attr(755,root,root) %{_bindir}/emma
 %attr(755,root,root) %{_bindir}/emma

-%{_datadir}/locale/*/*/*
-%{_datadir}/emma/*
-%{_applnkdir}/Applications/emma.desktop
-%{_datadir}/gnome/help/emma/*
+%{_datadir}/emma
+%{_applnkdir}/Utilities/emma.desktop