- updated gimp1.3 patch, added datadir patch, switched to vfolders; release 7

Changed files:
    xsane.spec -> 1.50

diff --git a/xsane.spec b/xsane.spec
index 7548e96f19b897ac5a0348a652c3e3cbcd8fbfdc..8f6d274bbd5fa1af41eb6fe9c320fc7daba409b5 100644 (file)
--- a/xsane.spec
+++ b/xsane.spec
@@ -7,7 +7,7 @@ Summary(pl):    Ulepszony frontend do SANE
 Summary(zh_CN): xsane - Ò»¸öͼÐÎɨÃè³ÌÐò
 Name:          xsane
 Version:       0.92
-Release:       6
+Release:       7
 License:       GPL
 Group:         X11/Applications/Graphics
 #Source0Download:      http://www.xsane.org/cgi-bin/sitexplorer.cgi?/download/
@@ -16,8 +16,10 @@ Source0:     http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Patch0:                %{name}-DESTDIR.patch
+# based on http://people.debian.org/~jblache/misc/xsane-0.92_gimp2.0.patch
 Patch1:                %{name}-gimp1.3.patch
 Patch2:                %{name}-po.patch
+Patch3:                %{name}-datadir.patch
 URL:           http://www.xsane.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -26,7 +28,7 @@ BuildRequires:        gettext-devel
 BuildRequires: gimp-devel >= 1.0.0
 BuildRequires: gtk+-devel >= 1.2.0
 %else
-BuildRequires: gimp-devel >= 1:1.3.17
+BuildRequires: gimp-devel >= 1:1.3.23
 BuildRequires: gtk+2-devel >= 2.0.0
 %endif
 BuildRequires: libjpeg-devel
@@ -50,6 +52,7 @@ do komunikacji ze skanerem.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 mv -f po/{sr,sr@Latn}.po
 mv -f po/{zh,zh_TW}.po
@@ -59,21 +62,18 @@ mv -f po/{zh,zh_TW}.po
 # AM_PATH_SANE
 head -n 622 aclocal.m4 | tail -n +457 > acinclude.m4
 %if %{with gtk1}
-echo 'AC_DEFUN([AM_PATH_GTK2],[])' >> acinclude.m4
+cat >> acinclude.m4 <<EOF
+AC_DEFUN([AM_PATH_GTK2],[])
+AC_DEFUN([AM_PATH_GIMP_2_0],[])
+EOF
 %else
 cat >> acinclude.m4 <<EOF
-AC_DEFUN([AM_PATH_GTK],[true])
+AC_DEFUN([AM_PATH_GTK],[])
+AC_DEFUN([AM_PATH_GIMP],[])
 AC_DEFUN([AM_PATH_GTK2],[AM_PATH_GTK_2_0(\$1,\$2,\$3)])
-AC_DEFUN([AM_PATH_GIMP],[
-AM_PATH_GIMP_2_0(\$1,\$2)
-save_CPPFLAGS="\$CPPFLAGS"
-CPPFLAGS="\$CPPFLAGS \$GIMP_CFLAGS"
-AC_CHECK_HEADERS([libgimp/gimp.h libgimp/gimpfeatures.h])
-CPPFLAGS="\$save_CPPFLAGS"
 ])
 EOF
 %endif
-echo 'AC_DEFUN([AM_FUNC_ALLOCA],[AC_FUNC_ALLOCA])' >> acinclude.m4
 
 %build
 cp -f /usr/share/automake/config.* .
@@ -88,12 +88,12 @@ touch po/POTFILES.in
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_gimpplugindir},%{_applnkdir}/Graphics,%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT{%{_gimpplugindir},%{_desktopdir},%{_pixmapsdir}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Graphics
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 ln -sf %{_bindir}/xsane $RPM_BUILD_ROOT%{_gimpplugindir}/xsane
@@ -105,11 +105,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc xsane.{ACCELKEYS,AUTHOR,BACKENDS,BUGS,CHANGES,LOGO,NEWS}
-%doc xsane.{PROBLEMS,TODO,BEGINNERS-INFO,ONLINEHELP}
+%doc xsane.{ACCELKEYS,AUTHOR,BACKENDS,BUGS,CHANGES,LOGO,NEWS,PROBLEMS,TODO,BEGINNERS-INFO,ONLINEHELP}
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_gimpplugindir}/*
-%{_datadir}/sane
+%{_datadir}/xsane
 %{_mandir}/man1/*
-%{_applnkdir}/Graphics/*
+%{_desktopdir}/*.desktop
 %{_pixmapsdir}/*