- ver. 0.8.0 (probably will conflict with zope)

Changed files:
    gaphor.spec -> 1.8

diff --git a/gaphor.spec b/gaphor.spec
index e210b1ac4ca965c56a2393dc3dfbae1e7ac32c20..4491483e0f65dfd0fe417ac8b62aa4dfe24daf5f 100644 (file)
--- a/gaphor.spec
+++ b/gaphor.spec
@@ -1,21 +1,21 @@
 Summary:       UML modeling environment written in Python
 Summary(pl):   ¦rodowisko modelowania UML oparte o Pythona
 Name:          gaphor
-Version:       0.7.0
+Version:       0.8.0
 Release:       1
 License:       GPL
 Group:         Applications/Engineering
 Source0:       http://dl.sourceforge.net/gaphor/%{name}-%{version}.tar.gz
-# Source0-md5: ed771389b03f4a8ab06b4021263dbe74
+# Source0-md5: 3c320b5166523a3d0f21d52c15b1a509
 Source1:       %{name}.desktop
 Patch0:                %{name}-datadir.patch
 URL:           http://gaphor.sourceforge.net/
 BuildRequires: X11-Xvfb
 BuildRequires: python-devel
-BuildRequires: python-diacanvas >= 0.13
+BuildRequires: python-diacanvas >= 0.14.3
 BuildRequires: python-pygtk-gtk >= 2.0.0
 %pyrequires_eq python-libs
-Requires:      python-diacanvas >= 0.13
+Requires:      python-diacanvas >= 0.14.3
 Requires:      python-pygtk-gtk >= 2.0.0
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -32,10 +32,10 @@ podejmowaniu decyzji. Gaphor u
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p0
 
 %build
-/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate >/dev/null 2>&1 &
+Xvfb :69 -nolisten tcp -ac -terminate >/dev/null 2>&1 &
 xvfb_pid=${!}
 DISPLAY=:69 \
        python setup.py build
@@ -45,22 +45,18 @@ kill ${xvfb_pid} >/dev/null 2>&1 || :
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_desktopdir}}
 
-/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate >/dev/null 2>&1 &
+Xvfb :69 -nolisten tcp -ac -terminate >/dev/null 2>&1 &
 xvfb_pid=${!}
 DISPLAY=:69 \
        python setup.py install \
                --optimize=2 \
                --root=$RPM_BUILD_ROOT
-               --build-dir=$(pwd)
 kill ${xvfb_pid} >/dev/null 2>&1 || :
 
-cat <<EOF > $RPM_BUILD_ROOT%{_bindir}/%{name}
-#!/usr/bin/python -O
-import gaphor
-gaphor.main()
-EOF
-
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+
+%py_postclean
+
 %find_lang %{name}
 
 %clean
@@ -70,15 +66,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README PKG-INFO NEWS TODO AUTHORS
 %attr(755,root,root) %{_bindir}/*
-%dir %{py_sitescriptdir}/%{name}
-%dir %{py_sitescriptdir}/%{name}/ui
-%dir %{py_sitescriptdir}/%{name}/misc
-%dir %{py_sitescriptdir}/%{name}/diagram
-%dir %{py_sitescriptdir}/%{name}/UML
-%{py_sitescriptdir}/%{name}/*.py[oc]
-%{py_sitescriptdir}/%{name}/ui/*.py[oc]
-%{py_sitescriptdir}/%{name}/misc/*.py[oc]
-%{py_sitescriptdir}/%{name}/diagram/*.py[oc]
-%{py_sitescriptdir}/%{name}/UML/*.py[oc]
+%{py_sitescriptdir}/%{name}
+%{py_sitescriptdir}/zope
 %{_datadir}/%{name}
 %{_desktopdir}/%{name}.desktop