Re: budowanie z CVSa - howto?

Tue, 23 Jun 2009 14:28:58 -0700 

06/22/2009 12:09 AM, Daniel Dawid Majewski wrotek:
> Pewnego dnia wpadła wieść od Adam Skowroński i powiedziała :
>> No i nie mogę sobie celestii zbudować :(
> Z tego, co widzę, to celestia jest domyślnie na kde3, a mamy kde4. Ogólnie 
> spec do odświeżenia...
> 
Trochę go odświeżyłem, ale nie wiem czy dobrze, bo pierwszy raz robiłem.
To co osiągnąłem to fakt, że mogę skompilować to pod gtk.
Niestety, trzeba użyć opcji --without kde, więc się pewnie na buildery
nie nadaje, ale może komuś się przyda.

Z KDE są dwa problemy:
- buildrequires zamiast kdelibs-devel powinno mieć kde4-kdelibs-devel
- no i celestia wymaga Qt3.3 więc albo zrobimy za autorów aplikacji
przeportowanie na Qt4 (ale to chyba oni powinni robić0, albo
wykorzystamy klasy "kompatybilnościowe wstecz" z QT4 z serii Qt3Costam,
ale to jest już chyba mocno gruba zmiana i chyba raczej nie zadziała od
kopa. Nie mam niestety na to czasu w tej chwili.

Więc w załącznikach pliki pozwalające na skopilowanie pod gtk.

Adam Skowroński.

-- 
(""="")  Adam 'TYTUS' Skowroński           http://tytus.oldfield.org.pl/
 `.,,'    ty...@oldfield.org.pl      jabber:adam.skowron...@jabberpl.org
 ,' ',        Fanklub Oldfielda: http://mike.oldfield.org.pl/
      '         ...und alle Ochsen haben Angst vor mir...
"internet jest skanowany programem antywirusowym, prosze czekać"

# $Revision: 1.71 $, $Date: 2008/09/02 19:37:50 $
#
# Conditional build:
%bcond_without  kde             # KDE UI as the default one
%bcond_with     gtk             # use GTK+2 UI instead
%bcond_with     gnome           # use libgnome2 UI instead
%bcond_with     glut            # use glut UI instead
%bcond_without  theora          # without theora support
#
%if %{with gtk} || %{with gnome} || %{with glut}
%undefine       with_kde
%endif
Summary:        A real-time visual space simulation
Summary(pl.UTF-8):      Symulacja przestrzeni kosmicznej w czasie rzeczywistym
Name:           celestia
Version:        1.5.1
Release:        1
License:        GPL
Group:          X11/Applications/Science
Source0:        http://dl.sourceforge.net/celestia/%{name}-%{version}.tar.gz
# Source0-md5:  df6854a2cf62d2e96612398c13b68fd2
Patch0:         %{name}-as-needed.patch
Patch1:         %{name}-gcc43.patch
Patch2:         %{name}-extras.patch
Patch3:         %{name}-desktop.patch
Patch4:         %{name}-lua51.patch
Patch5:         %{name}-automake.patch
URL:            http://www.shatters.net/celestia/
BuildRequires:  OpenGL-GLU-devel
BuildRequires:  compat-gcc-34-c++
%{?with_glut:BuildRequires:     OpenGL-glut-devel >= 4.0}
BuildRequires:  autoconf
BuildRequires:  automake
%if %{with gtk} || %{with gnome}
BuildRequires:  cairo-devel
BuildRequires:  gtk+2-devel >= 2:2.6
BuildRequires:  gtkglext-devel
%endif
BuildRequires:  gettext-devel
%{?with_kde:BuildRequires:      kdelibs-devel}
%{?with_gnome:BuildRequires:    libgnomeui-devel}
BuildRequires:  libjpeg-devel
BuildRequires:  libpng-devel
BuildRequires:  libstdc++-devel
%{?with_theora:BuildRequires:   libtheora-devel}
BuildRequires:  libtool
BuildRequires:  lua51-devel
BuildRequires:  pkgconfig
BuildRequires:  sed >= 4.0
# celestia < 1.4 original packages
Obsoletes:      celestia-extrasolar
Obsoletes:      celestia-generator
Obsoletes:      celestia-stars
Obsoletes:      celestia-task-default
# texture replacement addons, virtual provides
Obsoletes:      celestia-textures-earth
Obsoletes:      celestia-textures-earth-clouds
Obsoletes:      celestia-textures-earth-night
Obsoletes:      celestia-textures-galileanmoons
Obsoletes:      celestia-textures-mars
Obsoletes:      celestia-textures-mars-bumpmap
Obsoletes:      celestia-textures-mercury
Obsoletes:      celestia-textures-mercury-bumpmap
Obsoletes:      celestia-textures-moon
Obsoletes:      celestia-textures-moon-bumpmap
# celestia addons
Obsoletes:      celestia-blackhole
Obsoletes:      celestia-galaxies_extended
Obsoletes:      celestia-galaxy_clusters
Obsoletes:      celestia-globular_clusters
Obsoletes:      celestia-im-starwars
Obsoletes:      celestia-pathfinder
Obsoletes:      celestia-voyager
BuildRoot:      %{tmpdir}/%{name}-%{version}-root-%(id -u -n)

%description
Celestia is a free real-time space simulation that lets you experience
our universe in three dimensions. Unlike most planetarium software,
Celestia doesn't confine you to the surface of the Earth. You can
travel throughout the solar system, to any of over 100,000 stars, or
even beyond the galaxy. All travel in Celestia is seamless; the
exponential zoom feature lets you explore space across a huge range of
scales, from galaxy clusters down to spacecraft only a few meters
across. A 'point-and-goto' interface makes it simple to navigate
through the universe to the object you want to visit.

%description -l pl.UTF-8
Celestia to wolny symulator przestrzeni komicznej w czasie
rzeczywistym, który pozwala doświadczać naszego Wszechświata w
trzech wymiarach. W odróżnieniu od innych programów planetarnych
Celestia nie przywiązuje Cię do powierzchni ziemi. Możesz
podróżować przez Układ Słoneczny do ponad 100,000 gwiazd lub
nawet poza galaktykę. Wszystkie podróże w Celestii są
niezauważalne; funkcja wykładniczego przybliżenia pozwala Ci
odkrywać Kosmos w różnych skalach - od spojrzenia na galaktyki do
widoku kilkumetrowych statków kosmicznych. Interfejs typu
'pokaż-i-leć' czyni nawigację przez Wszechświat prostą.

%prep
%setup -q
%patch0
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4
%patch5 -p1

# ugly hack not to require GConf2-devel if we're not building gnome version
%{!?with_gnome:sed -i "s#AM_GCONF_SOURCE_2##g" configure.in}

%build
cp -f /usr/share/automake/config.sub admin
%{__make} -f admin/Makefile.common

%configure \
        %{?with_kde:--with-kde} \
        %{?with_gtk:--with-gtk} \
        %{?with_gnome:--with-gnome} \
        %{?with_glut:--with-glut} \
        --disable-rpath \
        %{!?with_theora:--disable-theora} \
        --with-lua \
        --with-qt-dir=%{_libdir}

%{__make}

%install
rm -rf $RPM_BUILD_ROOT

%{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        kde_htmldir=%{_kdedocdir} \
        kde_libs_htmldir=%{_kdedocdir} \
        appsdir=%{_desktopdir}/kde

# desktop/icon
install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
%{!?with_kde:install src/celestia/kde/data/celestia.desktop 
$RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop}
install src/celestia/kde/data/hi48-app-celestia.png 
$RPM_BUILD_ROOT%{_pixmapsdir}/celestia.png

%find_lang %{name} --all-name --with-kde

%clean
rm -rf $RPM_BUILD_ROOT

%if %{with gnome}
%post
%gconf_schema_install celestia.schemas

%preun
%gconf_schema_uninstall celestia.schemas
%endif

%files -f %{name}.lang
%defattr(644,root,root,755)
%doc README AUTHORS TODO controls.txt ChangeLog
%attr(755,root,root) %{_bindir}/*
%{_datadir}/celestia
%{_pixmapsdir}/*
%if %{with kde}
%{_datadir}/apps/celestia
%{_datadir}/config/*
%{_datadir}/mimelnk/application/*
%{_datadir}/services/*
%{_iconsdir}/*/*/apps/%{name}.png
%{_desktopdir}/kde/*.desktop
%else
%{_desktopdir}/*.desktop
%endif
%{?with_gnome:%{_sysconfdir}/gconf/schemas/celestia.schemas}

%define date    %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <feedb...@pld-linux.org>
All persons listed below can be reached at <cvs_login>@pld-linux.org

$Log: celestia.spec,v $
Revision 1.71  2008/09/02 19:37:50  qboosh
- bcond header, gtk+2 epoch, cleanup

Revision 1.70  2008/09/02 18:28:08  draenog
- use lua51 not lua50

Revision 1.69  2008/09/02 18:08:40  draenog
- BR: gettext-devel moved out of bcond

Revision 1.68  2008/09/02 18:02:43  draenog
- remove unrecognized option of configure

Revision 1.67  2008/09/02 17:44:50  draenog
- linking with theora is now predictable

Revision 1.66  2008/09/02 16:53:43  draenog
- correct BR for OpenGL

Revision 1.65  2008/09/02 16:41:28  draenog
- missing BR: gettext-devel

Revision 1.64  2008/09/01 14:25:48  draenog
- correct version of required GLUT API
- adapterized
- rel. 1

Revision 1.63  2008/08/29 12:48:30  draenog
- include celestia_constellations.mo files

Revision 1.62  2008/08/29 12:22:23  draenog
- up to 1.5.1
- lua50.patch and gcc4.patch applied upstream
- as-needed.patch
- gcc43.patch

Revision 1.61  2007/02/12 21:23:50  glen
- tabs in preamble

Revision 1.60  2007/02/12 00:48:41  baggins
- converted to UTF-8

Revision 1.59  2006/11/07 22:22:10  glen
- do not list %{_desktopdir}/* -- dangerous, could list directories unexpectedly

Revision 1.58  2006/07/18 22:52:09  havner
- rel 2 for fixed desktop patch

Revision 1.57  2006/06/29 22:59:15  havner
- 1.4.1
- manual for KDE: done
- obsoletes: done
- bconds for 4 availables UIs
  kde - the default one, the only one with help
  gtk - gtk2 UI (seems it got pretty well updated)
  gnome - same as gtk2 + libgnomeui and GConf2 configuration support
  glut - very raw without any menus it seems
- lua patch, get lua flags from pkg-config
- fixed makefile patch (KDE splash working now)
- desktop patch instead of .desktop source
- dont require GConf2 if not building gnome version
- tested and works (all 4 UIs)
- all other celestia*.spec are to be removed

Revision 1.56  2005/12/25 00:44:21  wolf
- 1.4.0
- get rid of old texture packages system, use ~/.celestia to put extra
  textures, objects, etc
  (http://lepp.cornell.edu/~seb/celestia/addon-intro.html)
- TODO: obsoletes
- TODO: makefiles in docs

Revision 1.55  2005/12/12 15:19:32  glen
- adapterized (sorted %verify flags)

Revision 1.54  2005/12/04 22:58:06  glen
- adapterized (sorted %verify flags)

Revision 1.53  2005/05/30 21:00:01  zbyniu
- BR: pkgconfig

Revision 1.52  2005/05/24 16:34:46  ankry
- rel. .2

Revision 1.51  2005/05/24 16:12:23  ankry
- attempt to fix amd64 build

Revision 1.50  2005/02/02 16:26:40  wolf
- ati patch won't be needed

Revision 1.49  2005/01/11 21:37:35  wolf
- snap 20050111

diff -Naur celestia-1.5.1/admin/cvs.sh celestia-1.5.1.automake/admin/cvs.sh
--- celestia-1.5.1/admin/cvs.sh 2008-04-23 21:18:37.000000000 +0000
+++ celestia-1.5.1.automake/admin/cvs.sh        2009-06-22 20:01:32.000000000 
+0000
@@ -66,7 +66,7 @@
     echo "*** KDE requires automake $required_automake_version"
     exit 1
     ;;
-  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | 
automake*1.10* ) : ;;
+  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | 
automake*1.10* | automake*.11* ) : ;;
   "" )
     echo "*** AUTOMAKE NOT FOUND!."
     echo "*** KDE requires automake $required_automake_version"
diff -Naur celestia-1.5.1/src/celengine/overlay.h 
celestia-1.5.1.automake/src/celengine/overlay.h
--- celestia-1.5.1/src/celengine/overlay.h      2008-04-23 21:17:16.000000000 
+0000
+++ celestia-1.5.1.automake/src/celengine/overlay.h     2009-06-22 
21:07:26.000000000 +0000
@@ -13,7 +13,7 @@
 #include <string>
 #include <iostream>
 #include <celtxf/texturefont.h>
-
+#include <stdio.h>
 
 class Overlay;
 
diff -Naur celestia-1.5.1/src/celengine/star.cpp 
celestia-1.5.1.automake/src/celengine/star.cpp
--- celestia-1.5.1/src/celengine/star.cpp       2008-04-23 21:17:16.000000000 
+0000
+++ celestia-1.5.1.automake/src/celengine/star.cpp      2009-06-22 
21:09:25.000000000 +0000
@@ -15,6 +15,7 @@
 #include "orbit.h"
 #include "star.h"
 #include "texmanager.h"
+#include <stdio.h>
 
 using namespace std;
 
diff -Naur celestia-1.5.1/data/Makefile.am 
celestia-1.5.1.automake/data/Makefile.am
--- celestia-1.5.1/data/Makefile.am     2008-04-23 21:18:03.000000000 +0000
+++ celestia-1.5.1.automake/data/Makefile.am    2009-06-22 23:46:53.000000000 
+0000
@@ -14,8 +14,7 @@
        $(wildcard *.dat) \
        $(wildcard *.xyz) \
        $(wildcard *.dsc) \
-       $(wildcard *.stc) \
-       stars.dat
+       $(wildcard *.stc) 
 
 EXTRA_DIST = \
        $(pkgdata_DATA) \
diff -Naur celestia-1.5.1/data/Makefile.in 
celestia-1.5.1.automake/data/Makefile.in
--- celestia-1.5.1/data/Makefile.in     2008-04-23 21:31:21.000000000 +0000
+++ celestia-1.5.1.automake/data/Makefile.in    2009-06-22 23:46:43.000000000 
+0000
@@ -304,8 +304,7 @@
        $(wildcard *.dat) \
        $(wildcard *.xyz) \
        $(wildcard *.dsc) \
-       $(wildcard *.stc) \
-       stars.dat
+       $(wildcard *.stc) 
 
 EXTRA_DIST = \
        $(pkgdata_DATA) \

_______________________________________________
pld-users-pl mailing list
pld-users-pl@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-users-pl

Odpowiedź listem elektroniczym