- pl, some cleanups

Changed files:
    gramps.spec -> 1.4

diff --git a/gramps.spec b/gramps.spec
index adad9880b87cdd0a8d4ef3c71a4c7fd31c2a7a2d..7b423bde32359cf1362a2f3984c1c4bce02c2ea8 100644 (file)
--- a/gramps.spec
+++ b/gramps.spec
@@ -1,22 +1,18 @@
-%define prefix   /usr
-%define localstatedir /var/lib
-%define _prefix   %prefix
-%define _localstatedir %localstatedir
-
-Summary:       Genealogical Research and Analysis Management Programming System.
+Summary:       Genealogical Research and Analysis Management Programming System
+Summary(pl):   System programowania do zarz±dzania badaniami i analiz± genealogiczn±
 Name:          gramps
 Version:       0.98.0
 Release:       0.1
 License:       GPL
 Group:         Applications/Science
-Source0:       http://download.sourceforge.net/gramps/%{name}-%{version}.tar.gz
+Source0:       http://dl.sourceforge.net/gramps/%{name}-%{version}.tar.gz
 # Source0-md5: 027500af2012889b37bfa99ab1e9e382
 URL:           http://gramps.sourceforge.net/
-BuildRequires: scrollkeeper >= 0.3.5
-BuildRequires: automake >= 1.6
 BuildRequires: autoconf >= 2.52
-BuildRequires: rpm >= 4.1
+BuildRequires: automake >= 1.6
 BuildRequires: desktop-file-utils >= 0.2.92
+BuildRequires: rpm >= 4.1
+BuildRequires: scrollkeeper >= 0.3.5
 Requires:      python >= 2.2
 Requires:      python-Imaging 
 Requires:      python-gnome >= 1.99
@@ -27,59 +23,63 @@ Requires:   python-pygtk >= 1.99
 Requires:      python-pygtk-glade >= 1.99
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _localstatedir  /var/lib
+
 %description
 gramps (Genealogical Research and Analysis Management Programming
 System) is a GNOME based genealogy program supporting a Python based
 plugin system.
 
+%description -l pl
+gramps (Genealogical Research and Analysis Management Programming
+System - system programowania do zarz±dzania badaniami i analiz±
+genealogiczn±) to oparty na GNOME program do genealogii obs³uguj±cy
+system wtyczek w Pythonie.
+
 %prep
 %setup -q
 
 %build
 if [ ! -f configure ]; then
-CFLAGS="$MYCFLAGS" ./autogen.sh $MYARCH_FLAGS --prefix=%{_prefix} \
-    --localstatedir=%localstatedir --bindir=%{_bindir} \
+CFLAGS="%{rpmcflags}" ./autogen.sh --prefix=%{_prefix} \
+    --localstatedir=%{_localstatedir} --bindir=%{_bindir} \
     --mandir=%{_mandir} --libdir=%{_libdir} --datadir=%{_datadir} \
     --includedir=%{_includedir} --sysconfdir=%{_sysconfdir}
 else
-  CFLAGS="$MYCFLAGS" %configure
+       %configure
 fi
 
-CFLAGS="%{rpmcflags}" make
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %makeinstall
-mkdir $RPM_BUILD_ROOT%{_datadir}/applications
+install -d $RPM_BUILD_ROOT%{_desktopdir}
+
 desktop-file-install --vendor gramps --delete-original \
-       --dir $RPM_BUILD_ROOT%{_datadir}/applications  \
-       --add-category Application                     \
-       --add-category Utility                         \
+       --dir $RPM_BUILD_ROOT%{_desktopdir} \
+       --add-category Application \
+       --add-category Utility \
        $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Applications/gramps.desktop
+
+rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
+
 %find_lang gramps
-rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/scrollkeeper/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post  -p /usr/bin/scrollkeeper-update
+%postun        -p /usr/bin/scrollkeeper-update
+
 %files -f gramps.lang
 %defattr(644,root,root,755)
-
 %doc AUTHORS COPYING-DOCS ChangeLog FAQ NEWS README TODO
-%doc %{_mandir}/man1/*
-
 %attr(755,root,root) %{_bindir}/gramps
-
-%{_datadir}/applications/*
-%{_datadir}/pixmaps/gramps.png
-
 %{_libdir}/gramps
 %{_datadir}/gramps
 %{_datadir}/omf/gramps
-
-%post
-if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
-
-%postun
-if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
+%{_desktopdir}/*
+%{_pixmapsdir}/gramps.png
+%{_mandir}/man1/*