- cleanups; TODO: x86 binary cannot be installed in _datadir!

Changed files:
    compupic.spec -> 1.11

diff --git a/compupic.spec b/compupic.spec
index 669712dfe8e0286fe2fe094064f1e86ae4b17b9a..65c6e0e073d84d0ee347e19990ef9306f71fb30b 100644 (file)
--- a/compupic.spec
+++ b/compupic.spec
@@ -10,19 +10,20 @@ Source0:    http://www.photodex.com/files.system/linux/%{name}-%{version}-i386-Linu
 # Source0-md5: 7c4c1f042cfef63055de960933d7a19c
 Source1:       %{name}.desktop
 URL:           http://www.photodex.com/products/compupic/index.html
-BuildRequires: coreutils
+BuildRequires: perl-base
 ExclusiveArch: %{ix86}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-The fastest, easiest to use software for browsing and viewing pictures. 
-CompuPic gives you unmatched performance paired with a full set of 
-features for editing, sharing, and using your digital content.
+The fastest, easiest to use software for browsing and viewing
+pictures. CompuPic gives you unmatched performance paired with a full
+set of features for editing, sharing, and using your digital content.
 
 %description -l pl
-Najszybsze i naj³atwiejsze w u¿yciu narzêdzie do przegl±dania i podgl±du
-obrazków. CompuPic daje nieporównywaln± wydajno¶æ po³±czon± z pe³n± gam±
-mo¿liwo¶ci edycji, udostêpniania oraz u¿ywania cyfrowych zasobów.
+Najszybsze i naj³atwiejsze w u¿yciu narzêdzie do przegl±dania i
+podgl±du obrazków. CompuPic daje nieporównywaln± wydajno¶æ po³±czon± z
+pe³n± gam± mo¿liwo¶ci edycji, udostêpniania oraz u¿ywania cyfrowych
+zasobów.
 
 %prep
 %setup -q -n compupic-5.1.1063-i386-Linux
@@ -33,13 +34,13 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_datadir}/compupic,%{_pixmapsdir},%{_desktopdir}}
 
 tar xf compupic.tar -C $RPM_BUILD_ROOT%{_datadir}/compupic
-mv -f $RPM_BUILD_ROOT%{_datadir}/compupic/compupic.1 $RPM_BUILD_ROOT%{_mandir}/man1/
-mv $RPM_BUILD_ROOT%{_datadir}/compupic/*.xpm   $RPM_BUILD_ROOT%{_pixmapsdir}/
-mv $RPM_BUILD_ROOT%{_datadir}/compupic/LICENSE ./
-mv $RPM_BUILD_ROOT%{_datadir}/compupic/README ./
+mv -f $RPM_BUILD_ROOT%{_datadir}/compupic/compupic.1 $RPM_BUILD_ROOT%{_mandir}/man1
+mv $RPM_BUILD_ROOT%{_datadir}/compupic/*.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
+mv $RPM_BUILD_ROOT%{_datadir}/compupic/LICENSE .
+mv $RPM_BUILD_ROOT%{_datadir}/compupic/README .
 cd $RPM_BUILD_ROOT%{_datadir}/compupic
-perl -pi -e 's/libn/FOOB/g' compupic
-perl -pi -e 's/nss/FOO/g' compupic
+%{__perl} -pi -e 's/libn/FOOB/g' compupic
+%{__perl} -pi -e 's/nss/FOO/g' compupic
 ln compupic ../../bin/compupic
 cd -
 
@@ -52,13 +53,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README LICENSE
 %attr(755,root,root) %{_bindir}/compupic
+%dir %{_datadir}/compupic
+# XXX: it can't be in %{_datadir}
+%attr(755,root,root) %{_datadir}/compupic/compupic
 %doc %{_datadir}/compupic/english
 %doc %{_datadir}/compupic/web
-%{_mandir}/man1/compupic*
-%attr(755,root,root) %{_datadir}/compupic/compupic
 %{_datadir}/compupic/cpicoeme.bmp
 %{_datadir}/compupic/defscr
 %{_datadir}/compupic/docscr
 %{_datadir}/compupic/order.txt
 %{_pixmapsdir}/cpicicon-*.xpm
 %{_desktopdir}/compupic.desktop
+%{_mandir}/man1/compupic.1*