- merged from DEVEL

Changed files:
    dia.spec -> 1.91

diff --git a/dia.spec b/dia.spec
index 8f639e4ad748cb3735e2f504977f13e8dd34743c..583c5fe014478aa40f589c63f932b62df915afe5 100644 (file)
--- a/dia.spec
+++ b/dia.spec
@@ -1,3 +1,4 @@
+%define        snap    20030902.0723
 Summary:       Dia - a gtk+ based diagram creation program
 Summary(es):   Programa para dibujo de diagramas
 Summary(pl):   Dia - program do tworzenia diagramów
@@ -6,18 +7,19 @@ Summary(ru):  
 Summary(uk):   ðÒÏÇÒÁÍÁ ÄÌÑ ÍÁÌÀ×ÁÎÎÑ Ä¦ÁÇÒÁÍ
 Summary(zh_CN):        »ùÓÚgtk+µÄÁ÷³Ìͼ³ÌÐò
 Name:          dia
-Version:       0.91
-Release:       2
+Version:       0.92
+Release:       0.%{snap}.1
 Epoch:         1
 License:       GPL
 Group:         X11/Applications/Graphics
 Vendor:                James Henstridge <james@daa.com.au>
 # this for final releases
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/dia/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: 283517483601e81749db81a849a3bc91
+#Source0:      http://ftp.gnome.org/pub/GNOME/sources/dia/%{version}/%{name}-%{version}.tar.bz2
 # this only for snapshots
-#Source0:      http://www.crans.org/~chepelov/dia/snapshots/%{name}-CVS-%(echo %snap | sed 's/\./-/').tar.gz
+Source0:       http://www.crans.org/~chepelov/dia/snapshots/%{name}-CVS-%(echo %{snap} | tr . -).tar.gz
+# Source0-md5: e373090fa4cf8ea2da3b57fe434ed11d
 Patch0:                dia-state.patch
+Patch1:                dia-am.patch
 URL:           http://www.lysator.liu.se/~alla/dia/dia.html
 BuildRequires: autoconf
 BuildRequires: automake
@@ -75,12 +77,18 @@ PostScript(TM).
 Á ÔÁËÏÖ ÅËÓÐÏÒÔÕ×ÁÔÉ §È × PostScript(TM).
 
 %prep
-%setup -q
+#%setup -q
+%setup -q -n %{name}-cvs-snapshot
 %patch0 -p1
+%patch1 -p1
 
 %build
-%configure \
-       --enable-gnome
+%{__libtoolize}
+%{__aclocal}
+%{__autoheader}
+%{__autoconf}
+%{__automake}
+%configure
 %{__make}
 
 %install
@@ -90,23 +98,6 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT \
        Applicationsdir=%{_desktopdir}
 
-#Fixme!!!!!!
-#Dirty hack for desktop file
-echo "Categories=Application;Office;" >> $RPM_BUILD_ROOT%{_desktopdir}/dia.desktop
-
-# for libxslt plugin; DIA_PLUGIN_PATH is required by libxslt plugin, so set
-# it before running dia app
-mv $RPM_BUILD_ROOT%{_bindir}/dia $RPM_BUILD_ROOT%{_bindir}/dia.bin
-
-cat > $RPM_BUILD_ROOT%{_bindir}/dia <<END
-#!/bin/sh
-
-DIA_PLUGIN_PATH=%{_datadir}/dia/plugins
-export DIA_PLUGIN_PATH
-
-exec %{_bindir}/dia.bin
-END
-
 %find_lang %{name} --with-gnome
 
 %clean