- added libxml-includes patch (add libxml prefix before header files)

- rel. 2
STBR

Changed files:
    rox.spec -> 1.16

diff --git a/rox.spec b/rox.spec
index 3a51386f6bac2dbe6634d3f41c8b0769a13e280c..d620d2a2d54cce9d7f7fccfeb2ae1b5f81446844 100644 (file)
--- a/rox.spec
+++ b/rox.spec
@@ -2,15 +2,15 @@ Summary:      File-manager
 Summary(pl):   Menad¿er plików
 Name:          rox
 Version:       1.2.0
-Release:       5
+Release:       2
 License:       GPL
 Group:         X11/Applications
 Source0:       ftp://ftp.sourceforge.net/pub/sourceforge/rox/%{name}-%{version}.tgz
-Source1:       %{name}.desktop
+Patch0:                %{name}-libxml-includes.patch
 URL:           http://rox.sourceforge.net/
 BuildRequires: gtk+-devel
 BuildRequires: gdk-pixbuf-devel
-BuildRequires: libxml-devel
+BuildRequires: libxml2-devel
 Requires:      rox-base
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -27,16 +27,15 @@ dla Linuksa i innych uniks
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 ./ROX-Filer/AppRun --compile
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/ROX-Filer,%{_mandir}/man1}
-install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_applnkdir}/Utilities}
+install -d $RPM_BUILD_ROOT/{%{_bindir},%{_datadir}/ROX-Filer,%{_mandir}/man1}
 
-ln -sf  ../ROX-Filer/AppIcon.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/rox.xpm
 cp -R ROX-Filer/* $RPM_BUILD_ROOT%{_datadir}/ROX-Filer
 install %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
@@ -49,8 +48,6 @@ EOF
 
 echo ".so rox.1" >$RPM_BUILD_ROOT%{_mandir}/man1/ROX-Filer.1
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Utilities/
-
 gzip -9nf ROX-Filer/Help/Changes ROX-Filer/Help/README \
        ROX-Filer/Help/README-es ROX-Filer/Help/TODO
 
@@ -61,7 +58,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc ROX-Filer/Help/*.html ROX-Filer/Help/*.gz
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_datadir}/ROX-Filer/Linux-ix86
+%attr(755,root,root) %{_datadir}/ROX-Filer/Linux-ix86/*
 %attr(755,root,root) %{_datadir}/ROX-Filer/AppRun
 %{_mandir}/man1/*
 %dir %{_datadir}/ROX-Filer
@@ -70,8 +67,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ROX-Filer/*.xml
 %{_datadir}/ROX-Filer/*.css
 %{_datadir}/ROX-Filer/Styles
-%{_datadir}/ROX-Filer/Help
-%{_datadir}/ROX-Filer/Messages
-%{_datadir}/ROX-Filer/pixmaps
-%{_applnkdir}/Utilities/*
-%{_pixmapsdir}/rox.xpm
+%{_datadir}/ROX-Filer/Help/*
+%{_datadir}/ROX-Filer/Messages/*
+%{_datadir}/ROX-Filer/pixmaps/*