- fix by kloczek

[packages/3ddesktop.git] / 3ddesktop.spec

diff --git a/3ddesktop.spec b/3ddesktop.spec
index 70939505f1f9a35a100c4694c1168d8d33a1751c..8937ebacaa53aae8f267211c329fb806b1636eb2 100644 (file)
--- a/3ddesktop.spec
+++ b/3ddesktop.spec
@@ -1,24 +1,24 @@
 Summary:       An OpenGL virtual desktop switching program
 Summary(pl):   Program prze³±czaj±cy wirtualne pulpity wykorzystuj±cy OpenGL
 Name:          3ddesktop
-Version:       0.2.0
-Release:       0.3
+Version:       0.2.5
+Release:       1
 License:       GPL v2
 Group:         X11/Applications
-Source0:       http://www.systemtoolbox.com/bard/3ddesktop/dl/%{name}-%{version}.tar.gz
-Patch0:                %{name}-DESTDIR.patch
-Patch1:                %{name}-ac_fix.patch
-Patch2:                %{name}-other_prefix.patch
-URL:           http://www.systemtoolbox.com/bard/3ddesktop/
+#Source0-md5:  afecac14b6d432e757e37085d4bc8549
+Source0:       http://dl.sourceforge.net/desk3d/%{name}-%{version}.tar.gz
+URL:           http://desk3d.sourceforge.net/
 BuildRequires: OpenGL-devel
-BuildRequires: glut-devel
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: glut-devel
 BuildRequires: gtk+-devel
 BuildRequires: imlib2-devel
+BuildRequires: kdelibs-devel >= 3.0.3
+BuildRequires: libstdc++-devel
+Requires:      OpenGL
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _prefix         /usr/X11R6
 %define        _noautoreqdep   libGL.so.1 libGLU.so.1
 
 %description
@@ -40,29 +40,30 @@ ekrany. Dost
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 cp -f /usr/share/automake/missing .
-aclocal
+%{__aclocal}
+%{__autoheader}
 %{__autoconf}
-CPPFLAGS="-I/usr/X11R6/include" ; export CPPFLAGS
-%configure
+%{__automake}
+%configure \
+       --with-kde-includes="/usr/include" \
+       --with-qt-includes="/usr/include/qt"
 %{__make} OPT=""
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog README TODO
+%doc AUTHORS ChangeLog README TODO
 %attr(755,root,root) %{_bindir}/*
 %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/*
 %{_datadir}/%{name}