- state patch breaks compatibility with dia files

[packages/dia.git] / dia.spec

diff --git a/dia.spec b/dia.spec
index a50a1573f593e170796d371ba744445d64e7c00a..298ece4e8ed91a7f308b317ee6bddc4f91b22bea 100644 (file)
--- a/dia.spec
+++ b/dia.spec
@@ -1,5 +1,6 @@
 
-%define snap 20021022.0723
+#%%define      snap    20030908.0723
+#%define       pre             pre5
 
 Summary:       Dia - a gtk+ based diagram creation program
 Summary(es):   Programa para dibujo de diagramas
@@ -9,16 +10,20 @@ Summary(ru): 
 Summary(uk):   ðÒÏÇÒÁÍÁ ÄÌÑ ÍÁÌÀ×ÁÎÎÑ Ä¦ÁÇÒÁÍ
 Summary(zh_CN):        »ùÓÚgtk+µÄÁ÷³Ìͼ³ÌÐò
 Name:          dia
-Version:       0.90
-Release:       1.%{snap}
+Version:       0.92.2
+Release:       2
 Epoch:         1
 License:       GPL
 Group:         X11/Applications/Graphics
 Vendor:                James Henstridge <james@daa.com.au>
-# this for final releases
-#Source0:      ftp://ftp.gnome.org/pub/GNOME/sources/dia/%{version}/%{name}-%{version}.tar.gz
-# this only for snapshots
-Source0:       http://www.crans.org/~chepelov/dia/snapshots/%{name}-CVS-%(echo %snap | sed 's/\./-/').tar.gz
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/dia/0.92/%{name}-%{version}.tar.bz2
+# Source0-md5: 2c14d023bd905e65368ee3df3248dc2a
+## this only for snapshots
+##Source0:     http://www.crans.org/~chepelov/dia/snapshots/%{name}-CVS-%(echo %{snap} | tr . -).tar.gz
+## this for pre releases
+##Source0:     http://ftp.gnome.org/pub/GNOME/sources/dia/%{version}/%{name}-%{version}-%{pre}.tar.bz2
+#Patch0:               dia-state.patch
+Patch1:                dia-am.patch
 URL:           http://www.lysator.liu.se/~alla/dia/dia.html
 BuildRequires: autoconf
 BuildRequires: automake
@@ -28,8 +33,6 @@ BuildRequires:        libgnomeui-devel
 BuildRequires: libxslt-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _sysconfdir     /etc/X11/GNOME
-
 %description
 Dia is a program designed to be much like the Windows program 'Visio'.
 It can be used to draw different kind of diagrams. In this first
@@ -78,13 +81,18 @@ PostScript(TM).
 Á ÔÁËÏÖ ÅËÓÐÏÒÔÕ×ÁÔÉ §È × PostScript(TM).
 
 %prep
-#%setup -q
-%setup -q -n dia-cvs-snapshot
+%setup -q
+#%setup -q -n %{name}-%{version}-%{pre}
+#%patch0 -p1
+%patch1 -p1
 
 %build
-./autogen.sh
-%configure \
-       --enable-gnome
+%{__libtoolize}
+%{__aclocal}
+%{__autoheader}
+%{__autoconf}
+%{__automake}
+%configure
 %{__make}
 
 %install
@@ -92,7 +100,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       Applicationsdir=%{_applnkdir}/Graphics
+       Applicationsdir=%{_desktopdir}
 
 %find_lang %{name} --with-gnome
 
@@ -105,13 +113,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 
 %dir %{_libdir}/dia
-%attr(755,root,root) %{_libdir}/dia/lib*.so.*
 %attr(755,root,root) %{_libdir}/dia/lib*.so
 %{_libdir}/dia/lib*.la
 
 %{_mandir}/man1/*
 
-%{_applnkdir}/Graphics/dia.desktop
 %{_datadir}/dia
 %{_datadir}/mime-info/*
+%{_desktopdir}/dia.desktop
 %{_pixmapsdir}/*