- simplifications (removed some macros bloat),

TODO: add desktop and png icon for bins-edit-gui.

Changed files:
    bins.spec -> 1.16

diff --git a/bins.spec b/bins.spec
index 0c3500f32ab6fa784f5368d4848aa5b44c96ee49..7ef9bcc4d5fb7212c5e367dc54b4e2c19fe6aca3 100644 (file)
--- a/bins.spec
+++ b/bins.spec
@@ -1,3 +1,6 @@
+# TODO:
+# - add desktop and png icon for bins-edit-gui.
+#
 %include       /usr/lib/rpm/macros.perl
 Summary:       HTML photo album generator
 Summary(pl):   Generator albumów fotograficznych w HTML
@@ -16,11 +19,8 @@ BuildRequires:       rpm-perlprov >= 3.0.3-18
 %requires_eq   perl
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define        _xprefix        /usr/X11R6
-%define _xbindir       %{_xprefix}/bin
-%define _xmandir       %{_xprefix}/man
-%define _xdatadir      %{_xprefix}/share
-%define _localedir     %{_datadir}/locale
+%define                _prefix         /usr/X11R6
+%define                _mandir         %{_prefix}/man
 
 %description
 The aim of BINS is to generate static HTML photo albums.
@@ -49,23 +49,23 @@ Graficzny interfejs u
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} \
-          $RPM_BUILD_ROOT{%{_xbindir},%{_xmandir}/man1} \
-          $RPM_BUILD_ROOT%{_xdatadir}/%{name} \
+          $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} \
+          $RPM_BUILD_ROOT%{_datadir}/%{name} \
           $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/templates.default \
-          $RPM_BUILD_ROOT%{_localedir}/{fr,de,pl}/LC_MESSAGES
+          $RPM_BUILD_ROOT%{_datadir}/locale/{fr,de,pl}/LC_MESSAGES
 
 install bins bins_edit $RPM_BUILD_ROOT%{_bindir}
-install bins-edit-gui $RPM_BUILD_ROOT%{_xbindir}
+install bins-edit-gui $RPM_BUILD_ROOT%{_bindir}
 install binsrc $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 install templates/*.html $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/templates.default
-install bins-edit-gui.glade $RPM_BUILD_ROOT%{_xdatadir}/%{name}
+install bins-edit-gui.glade $RPM_BUILD_ROOT%{_datadir}/%{name}
 install doc/{bins,bins_edit}.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install doc/*gui*.1 $RPM_BUILD_ROOT%{_xmandir}/man1
+install doc/*gui*.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 for L in fr de pl ; do
-       install intl/$L.mo $RPM_BUILD_ROOT%{_localedir}/$L/LC_MESSAGES/%{name}.mo
+       install intl/$L.mo $RPM_BUILD_ROOT%{_datadir}/locale/$L/LC_MESSAGES/%{name}.mo
        if [ -f intl/gui-$L.mo ] ; then
-               install intl/gui-$L.mo $RPM_BUILD_ROOT%{_localedir}/$L/LC_MESSAGES/%{name}-edit-gui.mo
+               install intl/gui-$L.mo $RPM_BUILD_ROOT%{_datadir}/locale/$L/LC_MESSAGES/%{name}-edit-gui.mo
        fi
 done
 
@@ -87,6 +87,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files edit-gui -f %{name}-edit-gui.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_xbindir}/bins-edit-gui
-%{_xmandir}/man1/*
-%{_xdatadir}/%{name}
+%attr(755,root,root) %{_bindir}/bins-edit-gui
+%{_mandir}/man1/*
+%{_datadir}/%{name}