packages/ClanLib branch AC-branch updated.
draenog
draenog at pld-linux.org
Wed Jul 4 13:17:37 CEST 2012
The branch, AC-branch has been updated
discards 581bd0d7689fe927eb06fd2197e18bf34bf66f7d (commit)
discards be92f2dda38ac069d7295d255217ffdd28dabbb7 (commit)
discards 033fe704835179beff8b8facb91d4059b065be1b (commit)
discards 3240bf51feb083401d0b69c8a4afaa5894b3166f (commit)
discards e3aabf905e86cfc7b214596bf994c1bb8170e95e (commit)
discards 63f2a0a7d0d8af8c7329cb81a7e23ad573c6ecc4 (commit)
discards a5a51242f19e722cb69125ab5752f17e78baa78f (commit)
discards fe1648ee76221242c8271171a8519c85efea4f57 (commit)
discards 72eb2cd9e8f6ec18f651a359306ab26ee2219e39 (commit)
discards 2133b30417234fdda9b409f1d8a1768dc178e1ed (commit)
discards 5480528eee3e498caa1615d1e2fa9d131b69aa5d (commit)
discards 6c56dd35df784c9ed77c658b3dd933e955d43395 (commit)
discards 6e247d73a781baec3c0b138651752225d9bc1f6a (commit)
discards 60cc680def34a6c0de148e4c37b95bdbde1b8d86 (commit)
discards 3225b24c86d0ae6b5f5678799c9751ba3fbb75e3 (commit)
discards f69ca62f0daba45266954c25f07f94085c7e3063 (commit)
discards 9983b260cc0a2babf6d1805ada20e6243b8f2edd (commit)
discards b5a3d8a720e38d5b6e237edb664ba4c2b081890c (commit)
discards f1a52b00d478b413d98ceeaf45537f36d95781d2 (commit)
discards 5e4cbb4ba2a58ee84a35fc7a0d7748b1e4f952f8 (commit)
discards ee9142684cbdba67b6403d900dff93068e0b54e2 (commit)
discards 7c019f5a0897cce1d93e0d59a918d49f1124f643 (commit)
discards cc4ea9ae1de4c0a64505673f7949923e7a5d720b (commit)
discards f3a2c74754577b15cd1a8cdb817a2849b5616a91 (commit)
discards c779ce8edebe0f72a0468a06c048c963ba07539b (commit)
discards bdfd9c45c7d26f6d632e4f354d30aec2ec7ecca2 (commit)
discards a75c35a70f89ce7386eca57ce21a738f5c3a1dd6 (commit)
discards cb59a012ac58e239279e46a2fddc39e20afcf99f (commit)
discards a29107fe2264b9cb5b1a8443af406f0349c20033 (commit)
discards 19048fe8c6a3f2bf0d54a721588e47688fdcdf8a (commit)
discards 71374b33845b95c0bb9b61a1ddd19d509a602f5a (commit)
discards ccadf7ac9c8a065e0c482ef09acc705e5987150f (commit)
discards 689629c0dbe9341bb2dacd2ecfa18b5a8484a1f8 (commit)
discards e1f758a37dfb54158629587236cba80c7f37f37a (commit)
discards 25e5f8cbefa8d76c3a546d6a1554d1a937e71c55 (commit)
discards aaaf539c72b7dedb8c34e9726a3e9b2e51792f76 (commit)
discards acabe0180e62f2c1a5688487a74cad345bbcc5f0 (commit)
discards 9c6140ee25322e7d6bb8ea7a73f97ac43c0519ad (commit)
discards 474e83334913b697287d898f66546eb7c184364b (commit)
discards b14344393818768837b9113e1c3ddaaeae834245 (commit)
discards 323da7a8a0f9c9ae7cfa9e569f9067dfe00f2a7c (commit)
discards d3611d827c613f78bb52b16c9e3f505e8798ea65 (commit)
discards c8c86bb1826e1e9d50942e8de67bc529e27f3d8c (commit)
discards 7086cdbf7c567d86949f6648e8925b60e16ad3e2 (commit)
discards 48245a90e5568d84e7c808d116152964b6a8b8de (commit)
discards 0726f15334b7c88e04c2dada3258c0e569f57053 (commit)
discards 3881b4b2b2ccf5b6b233acb243009cb4fd2a93c5 (commit)
discards 1a0c93cfb7c6fdc27809e3852343720210efd22e (commit)
discards ee27ba0d125b09c67ff9e9ed7cb8bc846ffab054 (commit)
discards 7df68d99109ae766a5447d6756e12ba931ffb4f2 (commit)
discards bc1d4c5eb93c64205c3a43d3c2db7b037070a921 (commit)
via bc3dd94b626030e7cb9dcc9813ad948636e0412d (commit)
via 4a866c666da71925fcbd37eebf41934f7fc1a3b9 (commit)
via 1a57fc78dcdaf1744974be3ff4a8c104c0c24f4e (commit)
via 8cdd6224b296e2070d1354259e107be04100b280 (commit)
via 6fcffdbf5e3542ad2e99c0b781c9159f9eeb9019 (commit)
via ac9464bdc9e11e633e3a3fcf1b23df8672cdaf08 (commit)
via 2c39f06ad585c35304152a8d94800acbecbaa557 (commit)
via 9f3d471da59af4db2141e733ac36c99b2567ea60 (commit)
via 38da125d7240abf8c45a5f96a3cbd774913954fc (commit)
via 0210b9c8e791ca2e6a607669c2280df0285d3fe8 (commit)
via 731eeacd224f5932d843f18f13762fb29612fabc (commit)
via 4d59e05a6dc2064a6ff33447db5740e92e220c19 (commit)
via ff4598e00b97380351ac329489e8971599ebcfb2 (commit)
via afcc957f0dfd5db68687d7ddecf5e93c5a0f091a (commit)
via e00575bb9819b4acf2c473e5c36ece2fa9bf77a6 (commit)
via df2d2e58d633bc75bab26abcc7a6f703b47c9ff1 (commit)
via 0be7b73b18761e3e3c32001470ad9c8c638ae3f9 (commit)
via 0896b6d93c1b91bbf572fc6acdbc0551ea85868d (commit)
via 4572ded46dd38f7bbe7a95a7a56fd2a7d47dd2e7 (commit)
via 9a64585bd8e8edfdb36edfecf06728463dbeb6fd (commit)
via 3723aa7a3530c5178ee4c580f0753132c57f8b7a (commit)
via 15ade5a23f7f1fbf83bb8c3e2d2b582234a2e782 (commit)
via 895a6c0c8e928962f5a9353586453c945424258b (commit)
via afe78ce4ae069985a6b7e3a7339e73df67c18810 (commit)
via 4c1b0a7f52500ccc41845e2001743225071f4688 (commit)
via 8c9b5e57e0427815981f836f70cecbb87de4293d (commit)
via c8be0a5f8429e1e8625324a4333e46435c00a6a5 (commit)
via 2fc2c4d7944b8c314d822b4248a0ab801918fc96 (commit)
via b05e5c0413d1b1ecf8d331a11b69565aa95d9b9c (commit)
via f59dc6ea1c6a37b215edf8578698547fd1bbd7f4 (commit)
via ff78f56c88e24847b3b00e22f09268bf6e3f7d3b (commit)
via 9c9eb4a326f53906baa12aade9b0054122014d6f (commit)
via ff7be8a7a176407149e85488feb5dd249447c012 (commit)
via a34aa188c2c97c5daebd10464b53d5755d297f2e (commit)
via 52ef878e2962c0632f80a5bfb99381c5d02eec12 (commit)
via 89e3b24134f002bb66ad31808a1c217ed26c895a (commit)
via 068d345c0be48075b8af0ea2bddc0c60a9b7dde9 (commit)
via 7e01e5ef378ade6082b00af83108f7b31120ae08 (commit)
via d45ff0c8969fd70a3f21c041829b3a21294840e9 (commit)
via 59fcdff1f89230f1fb3784f14caff15260c4ad65 (commit)
via 95fa7c2b9e0a0a69e8bcbcf8e926e8f1a7769fe1 (commit)
via eb6efecf9a75212a1f370a3400686aef9c66bb52 (commit)
via a58f38bd2562760ab7be0549fb6fe38cd29366cc (commit)
via ce4e497c163f30408208a988943a910bbec66431 (commit)
via 02911a789b0ca40dd5c52d8d96375e2f2d75a2a9 (commit)
via 4c294898218fb2d85d0eacba18839cd5c52f2f12 (commit)
via 1e8e7d0675ccdc851fe62bd869c5c6ece5b7cb56 (commit)
via d8e63515083a182bf43596c64e0779b9b3e28ee4 (commit)
via fd4ab41efd2ea6cf8c16ac444f524d596dc8a6c2 (commit)
via 1e09a19d34e1f333395c9efe797a4fb41bb97021 (commit)
via 431594d93a1d5102379d3926973d6442a130ac6d (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (581bd0d7689fe927eb06fd2197e18bf34bf66f7d)
\
N -- N -- N (bc3dd94b626030e7cb9dcc9813ad948636e0412d)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bc3dd94b626030e7cb9dcc9813ad948636e0412d
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Tue Dec 26 22:54:56 2006 +0000
- AC deps
Changed files:
ClanLib.spec -> 1.99.2.1
diff --git a/ClanLib.spec b/ClanLib.spec
index 58c43ee..f79e290 100644
--- a/ClanLib.spec
+++ b/ClanLib.spec
@@ -3,7 +3,7 @@ Summary(pl): ClanLib, niezale
Summary(pt_BR): SDK Clanlib
Name: ClanLib
Version: 0.8.0
-Release: 1
+Release: 2
License: BSD-like (see COPYING)
Group: Libraries
#Source0Download: http://www.clanlib.org/download.html
@@ -14,6 +14,7 @@ URL: http://www.clanlib.org/
BuildRequires: OpenGL-GLU-devel
BuildRequires: SDL >= 1.2.0
BuildRequires: SDL_gfx-devel >= 1.2.0
+BuildRequires: XFree86-devel
BuildRequires: autoconf >= 2.59-9
BuildRequires: automake >= 1.6
BuildRequires: libjpeg-devel
@@ -25,8 +26,6 @@ BuildRequires: libvorbis-devel >= 1:1.0
BuildRequires: libxslt-progs
BuildRequires: perl-base
BuildRequires: pkgconfig
-BuildRequires: xorg-lib-libXi-devel
-BuildRequires: xorg-lib-libXxf86vm-devel
Obsoletes: ClanLib-TTF
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -58,7 +57,7 @@ Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: libstdc++-devel
# for libclanDisplay
-Requires: xorg-lib-libXxf86vm-devel
+Requires: XFree86-devel
Obsoletes: ClanLib-TTF-devel
%description devel
@@ -116,8 +115,7 @@ Group: Development/Libraries
Requires: %{name}-OpenGL = %{version}-%{release}
Requires: %{name}-devel = %{version}-%{release}
Requires: OpenGL-GLU-devel
-Requires: xorg-lib-libXi-devel
-Requires: xorg-lib-libXxf86vm-devel
+Requires: XFree86-devel
%description OpenGL-devel
Header files for OpenGL ClanLib library.
commit 4a866c666da71925fcbd37eebf41934f7fc1a3b9
Author: cvs2git <feedback at pld-linux.org>
Date: Sat Dec 23 13:22:18 2006 +0000
This commit was manufactured by cvs2git to create branch 'AC-branch'.
Sprout from master 2003-12-29 12:28:00 UTC Jacek Konieczny <jajcus at pld-linux.org> '- include ft2build.h before other freetype headers'
Cherrypick from master 2006-12-23 13:22:18 UTC Jakub Bogusz <qboosh at pld-linux.org> '- typo':
ClanLib-link.patch -> 1.2
ClanLib.spec -> 1.99
diff --git a/ClanLib-link.patch b/ClanLib-link.patch
new file mode 100644
index 0000000..6eb48c4
--- /dev/null
+++ b/ClanLib-link.patch
@@ -0,0 +1,157 @@
+--- ClanLib-0.7.4/Sources/Application/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
++++ ClanLib-0.7.4/Sources/Application/Makefile.am 2003-10-09 23:15:08.843198880 +0200
+@@ -6,6 +6,7 @@
+ libclanApp_la_SOURCES = Unix/clanapp.cpp
+ endif
+
++libclanApp_la_LIBADD = ../Core/libclanCore.la
+ libclanApp_la_LDFLAGS = \
+ -release $(LT_RELEASE) \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+--- ClanLib-0.7.8/Sources/Display/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
++++ ClanLib-0.7.8/Sources/Display/Makefile.am 2003-10-09 23:16:41.208157272 +0200
+@@ -3,7 +3,7 @@
+ # FIXME: This needs to be @LIBS@ or @X11LIBS@ or something like that
+ if WIN32
+ else
+-libclanDisplay_la_LIBADD = -L/usr/X11R6/lib/ -lX11 -lXmu -lGL -lGLU -lpng -ljpeg -lXxf86vm @X_LIBS@
++libclanDisplay_la_LIBADD = -lX11 -lpng -ljpeg -lXxf86vm @X_LIBS@ ../Core/libclanCore.la
+ endif
+
+ libclanDisplay_la_SOURCES = \
+--- ClanLib-0.8.0-RC1/Sources/GL/Makefile.am.orig 2005-02-11 15:13:43.000000000 +0100
++++ ClanLib-0.8.0-RC1/Sources/GL/Makefile.am 2006-01-25 23:38:11.091887750 +0100
+@@ -51,7 +51,7 @@
+ GLX/input_device_x11keyboard.h \
+ GLX/input_device_xinput.cpp \
+ GLX/input_device_xinput.h
+-libclanGL_la_LIBADD = -lXxf86vm -lXi -lGLU -lGL
++libclanGL_la_LIBADD = -lXxf86vm -lXi -lGLU -lGL ../Display/libclanDisplay.la
+ endif
+
+ EXTRA_DIST = \
+--- ClanLib-0.7.4/Sources/GUI/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
++++ ClanLib-0.7.4/Sources/GUI/Makefile.am 2003-10-09 23:19:13.152058288 +0200
+@@ -82,6 +82,8 @@
+ filedialog.cpp \
+ window_generic.h
+
++libclanGUI_la_LIBADD = ../Display/libclanDisplay.la
++
+ libclanGUI_la_LDFLAGS = \
+ -release $(LT_RELEASE) \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+--- ClanLib-0.7.4/Sources/GUIStyleSilver/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
++++ ClanLib-0.7.4/Sources/GUIStyleSilver/Makefile.am 2003-10-09 23:21:06.631806744 +0200
+@@ -10,6 +10,7 @@
+ image_silver.h progressbar_silver.h window_silver.h \
+ inputbox_silver.h radiobutton_silver.h
+
++libclanGUIStyleSilver_la_LIBADD = ../GUI/libclanGUI.la
+ libclanGUIStyleSilver_la_LDFLAGS = \
+ -release $(LT_RELEASE) \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+--- ClanLib-0.7.4/Sources/MikMod/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
++++ ClanLib-0.7.4/Sources/MikMod/Makefile.am 2003-10-09 23:24:59.453412480 +0200
+@@ -8,7 +8,7 @@
+ soundprovider_mikmod.cpp \
+ soundprovider_mikmod_session.cpp
+
+-libclanMikMod_la_LIBADD = -lmikmod
++libclanMikMod_la_LIBADD = -lmikmod ../Sound/libclanSound.la
+
+ libclanMikMod_la_LDFLAGS = \
+ -release $(LT_RELEASE) \
+--- ClanLib-0.7.4/Sources/Network/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
++++ ClanLib-0.7.4/Sources/Network/Makefile.am 2003-10-09 23:25:43.592702288 +0200
+@@ -69,6 +69,7 @@
+ libclanNetwork_la_SOURCES += setupnetwork_unix.cpp
+ endif
+
++libclanNetwork_la_LIBADD = ../Core/libclanCore.la
+ libclanNetwork_la_LDFLAGS = \
+ -release $(LT_RELEASE) \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+--- ClanLib-0.7.4/Sources/SDL/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
++++ ClanLib-0.7.4/Sources/SDL/Makefile.am 2003-10-09 23:26:23.644613472 +0200
+@@ -20,7 +20,7 @@
+ surface_sdl.h
+
+ libclanSDL_la_CXXFLAGS = $(SDL_CFLAGS)
+-libclanSDL_la_LIBADD = $(SDL_LIBS)
++libclanSDL_la_LIBADD = $(SDL_LIBS) ../Display/libclanDisplay.la
+
+ libclanSDL_la_LDFLAGS = \
+ -release $(LT_RELEASE) \
+--- ClanLib-0.7.4/Sources/Sound/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
++++ ClanLib-0.7.4/Sources/Sound/Makefile.am 2003-10-09 23:27:44.491322904 +0200
+@@ -36,6 +36,7 @@
+ Unix/soundoutput_oss.h
+ endif
+
++libclanSound_la_LIBADD = ../Core/libclanCore.la
+ libclanSound_la_LDFLAGS = \
+ -release $(LT_RELEASE) \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+--- ClanLib-0.7.4/Sources/Vorbis/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
++++ ClanLib-0.7.4/Sources/Vorbis/Makefile.am 2003-10-09 23:28:39.064026592 +0200
+@@ -5,7 +5,7 @@
+ soundprovider_vorbis.cpp \
+ soundprovider_vorbis_session.cpp
+
+-libclanVorbis_la_LIBADD = -logg -lvorbis
++libclanVorbis_la_LIBADD = -logg -lvorbis ../Sound/libclanSound.la
+
+ libclanVorbis_la_LDFLAGS = \
+ -release $(LT_RELEASE) \
+--- ClanLib-0.8.0-RC1/Sources/Core/Makefile.am.orig 2005-07-10 01:25:31.000000000 +0200
++++ ClanLib-0.8.0-RC1/Sources/Core/Makefile.am 2006-01-26 21:57:59.647858500 +0100
+@@ -125,7 +125,7 @@
+ endif
+
+ # FIXME: Hardcoding these here might not be a good idea
+-libclanCore_la_LIBADD = @LIBPTHREAD@
++libclanCore_la_LIBADD = @LIBPTHREAD@ ../Signals/libclanSignals.la -ldl
+
+ libclanCore_la_LDFLAGS = \
+ -release $(LT_RELEASE) \
+--- ClanLib-0.8.0-RC1/configure.ac.orig 2005-10-20 22:57:15.000000000 +0200
++++ ClanLib-0.8.0-RC1/configure.ac 2006-01-26 18:13:46.567093500 +0100
+@@ -422,16 +422,15 @@
+ CXXFLAGS="$CXXFLAGS -I\$(top_srcdir)/Sources"
+
+ # Modules which will be build
+-ClanLib_Modules="Application"
+-ClanLib_pkgconfig="clanApp.pc"
++ClanLib_Modules="Signals Core Application"
++ClanLib_pkgconfig="clanSignals.pc clanCore.pc clanApp.pc"
+
+ # API header files for the Modules which will be installed
+-ClanLib_API_Modules="$ClanLib_API_Modules \$(clanApp_includes)"
++ClanLib_API_Modules="$ClanLib_API_Modules \$(clanSignals_includes) \$(clanCore_includes) \$(clanApp_includes)"
+
+ # Default examples which will be build
+ ClanLib_Examples="Directory Minimum Resources ResourcesCustom Signals ThreadSync XML Zip"
+
+-CLANLIB_ENABLE_MODULES([Core Signals])
+
+ if test "$enable_clanDisplay" = "yes"; then
+ CLANLIB_ENABLE_MODULES(Display)
+@@ -625,6 +624,8 @@
+ AC_SUBST(ClanLib_Examples)
+
+ AC_CONFIG_FILES([
++ pkgconfig/clanSignals.pc
++ pkgconfig/clanCore.pc
+ pkgconfig/clanApp.pc
+ pkgconfig/Makefile
+ Makefile
+@@ -632,6 +633,8 @@
+ Examples/Makefile.conf
+ Setup/Makefile
+ Sources/API/Makefile
++ Sources/Signals/Makefile
++ Sources/Core/Makefile
+ Sources/Application/Makefile
+ Sources/Makefile
+ Tests/Makefile.conf
diff --git a/ClanLib.spec b/ClanLib.spec
index ac81017..58c43ee 100644
--- a/ClanLib.spec
+++ b/ClanLib.spec
@@ -2,33 +2,32 @@ Summary: ClanLib, the platform independent game SDK
Summary(pl): ClanLib, niezale¿ny od platformy SDK do gier
Summary(pt_BR): SDK Clanlib
Name: ClanLib
-Version: 0.6.5
+Version: 0.8.0
Release: 1
-License: LGPL
+License: BSD-like (see COPYING)
Group: Libraries
-Source0: http://www.clanlib.org/~sphair/download/%{name}-%{version}-1.tar.gz
-# Source0-md5: 7115921953ef6fa45102c28622493650
-Patch0: %{name}-OPT.patch
-Patch1: %{name}-GL.patch
-Patch2: %{name}-assert.patch
+#Source0Download: http://www.clanlib.org/download.html
+Source0: http://www.clanlib.org/download/releases-0.8/%{name}-%{version}.tgz
+# Source0-md5: 3e183a801a31f646b012db2d82f97ff3
+Patch0: %{name}-link.patch
URL: http://www.clanlib.org/
-# doesn't build with 0.9.12
-#BuildRequires: DirectFB-devel = 0.9.9
-BuildRequires: Hermes-devel >= 1.3.1
-BuildRequires: OpenGL-devel
-BuildRequires: XFree86-devel
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: freetype-devel >= 2.0
+BuildRequires: OpenGL-GLU-devel
+BuildRequires: SDL >= 1.2.0
+BuildRequires: SDL_gfx-devel >= 1.2.0
+BuildRequires: autoconf >= 2.59-9
+BuildRequires: automake >= 1.6
BuildRequires: libjpeg-devel
BuildRequires: libmikmod-devel
BuildRequires: libpng-devel >= 1.0.8
BuildRequires: libstdc++-devel
+BuildRequires: libtool >= 2:1.4d-3
BuildRequires: libvorbis-devel >= 1:1.0
-# If broken - don't require it....
-#BuildRequires: lua-devel
-BuildRequires: perl
-Requires: Hermes >= 1.3.1
+BuildRequires: libxslt-progs
+BuildRequires: perl-base
+BuildRequires: pkgconfig
+BuildRequires: xorg-lib-libXi-devel
+BuildRequires: xorg-lib-libXxf86vm-devel
+Obsoletes: ClanLib-TTF
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _noautoreqdep libGL.so.1 libGLU.so.1
@@ -56,8 +55,11 @@ Summary: ClanLib development package
Summary(pl): Pakiet programistyczny dla ClanLib
Summary(pt_BR): Arquivos para desenvolvimento usando a Clanlib
Group: Development/Libraries
-Requires: %{name} = %{version}
-Requires: Hermes-devel
+Requires: %{name} = %{version}-%{release}
+Requires: libstdc++-devel
+# for libclanDisplay
+Requires: xorg-lib-libXxf86vm-devel
+Obsoletes: ClanLib-TTF-devel
%description devel
This is the development add-on package that includes the header files
@@ -73,22 +75,33 @@ a biblioteca Clanlib.
%package static
Summary: ClanLib static libraries
-Summary(pl): Biblioteki statyczne ClanLib
+Summary(pl): Statyczne biblioteki ClanLib
Group: Development/Libraries
-Requires: %{name}-devel = %{version}
+Requires: %{name}-devel = %{version}-%{release}
+Obsoletes: ClanLib-TTF-static
%description static
-ClanLib static libraries.
+This package contains static versions of ClanLib libraries.
%description static -l pl
-Biblioteki statyczne ClanLib.
+Ten pakiet zawiera statyczne wersje bibliotek ClanLib.
+
+%package doc
+Summary: ClanLib reference documentation for programmers
+Summary(pl): Dokumentacja programisty do biblioteki ClanLib
+Group: Documentation
+
+%description doc
+ClanLib reference documentation for programmers.
+
+%description doc -l pl
+Dokumentacja programisty do biblioteki ClanLib
%package OpenGL
Summary: OpenGL ClanLib library
Summary(pl): Biblioteka OpenGL dla ClanLiba
Group: Libraries
-Requires: %{name} = %{version}
-Requires: OpenGL
+Requires: %{name} = %{version}-%{release}
%description OpenGL
OpenGL ClanLib library.
@@ -97,15 +110,17 @@ OpenGL ClanLib library.
Biblioteka OpenGL dla ClanLiba.
%package OpenGL-devel
-Summary: Headers files for OpenGL ClanLib library
+Summary: Header files for OpenGL ClanLib library
Summary(pl): Pliki nag³ówkowe biblioteki OpenGL dla ClanLiba
Group: Development/Libraries
-Requires: %{name}-OpenGL = %{version}
-Requires: %{name}-devel = %{version}
-Requires: OpenGL-devel
+Requires: %{name}-OpenGL = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+Requires: OpenGL-GLU-devel
+Requires: xorg-lib-libXi-devel
+Requires: xorg-lib-libXxf86vm-devel
%description OpenGL-devel
-Headers files for OpenGL ClanLib library.
+Header files for OpenGL ClanLib library.
%description OpenGL-devel -l pl
Pliki nag³ówkowe biblioteki OpenGL dla ClanLiba.
@@ -114,7 +129,7 @@ Pliki nag
Summary: Static OpenGL ClanLib library
Summary(pl): Statyczna biblioteka OpenGL dla ClanLiba
Group: Development/Libraries
-Requires: %{name}-OpenGL-devel = %{version}
+Requires: %{name}-OpenGL-devel = %{version}-%{release}
%description OpenGL-static
Static OpenGL ClanLib library.
@@ -126,7 +141,7 @@ Statyczna biblioteka OpenGL dla ClanLiba.
Summary: MikMod ClanLib library
Summary(pl): Biblioteka MikMod dla ClanLiba
Group: Libraries
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
%description MikMod
MikMod ClanLib library.
@@ -135,15 +150,15 @@ MikMod ClanLib library.
Biblioteka MikMod dla ClanLiba.
%package MikMod-devel
-Summary: Headers files for MikMod ClanLib library
+Summary: Header files for MikMod ClanLib library
Summary(pl): Pliki nag³ówkowe biblioteki MikMod dla ClanLiba
Group: Development/Libraries
-Requires: %{name}-MikMod = %{version}
-Requires: %{name}-devel = %{version}
+Requires: %{name}-MikMod = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
Requires: libmikmod-devel
%description MikMod-devel
-Headers files for MikMod ClanLib library.
+Header files for MikMod ClanLib library.
%description MikMod-devel -l pl
Pliki nag³ówkowe biblioteki MikMod dla ClanLiba.
@@ -152,7 +167,7 @@ Pliki nag
Summary: Static MikMod ClanLib library
Summary(pl): Statyczna biblioteka MikMod dla ClanLiba
Group: Development/Libraries
-Requires: %{name}-MikMod-devel = %{version}
+Requires: %{name}-MikMod-devel = %{version}-%{release}
%description MikMod-static
Static MikMod ClanLib library.
@@ -160,11 +175,50 @@ Static MikMod ClanLib library.
%description MikMod-static -l pl
Statyczna biblioteka MikMod dla ClanLiba.
+%package SDL
+Summary: SDL ClanLib library
+Summary(pl): Biblioteka SDL dla ClanLiba
+Group: Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description SDL
+SDL ClanLib library.
+
+%description SDL -l pl
+Biblioteka SDL dla ClanLiba.
+
+%package SDL-devel
+Summary: Header files for SDL ClanLib library
+Summary(pl): Pliki nag³ówkowe biblioteki SDL dla ClanLiba
+Group: Development/Libraries
+Requires: %{name}-SDL = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+Requires: SDL-devel >= 1.2.0
+Requires: SDL_gfx-devel >= 1.2.0
+
+%description SDL-devel
+Header files for SDL ClanLib library.
+
+%description SDL-devel -l pl
+Pliki nag³ówkowe biblioteki SDL dla ClanLiba.
+
+%package SDL-static
+Summary: Static SDL ClanLib library
+Summary(pl): Statyczna biblioteka SDL dla ClanLiba
+Group: Development/Libraries
+Requires: %{name}-SDL-devel = %{version}-%{release}
+
+%description SDL-static
+Static SDL ClanLib library.
+
+%description SDL-static -l pl
+Statyczna biblioteka SDL dla ClanLiba.
+
%package Vorbis
Summary: Vorbis ClanLib library
Summary(pl): Biblioteka Vorbis dla ClanLiba
Group: Libraries
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
%description Vorbis
Vorbis ClanLib library.
@@ -173,14 +227,15 @@ Vorbis ClanLib library.
Biblioteka Vorbis dla ClanLiba.
%package Vorbis-devel
-Summary: Headers files for Vorbis ClanLib library
+Summary: Header files for Vorbis ClanLib library
Summary(pl): Pliki nag³ówkowe biblioteki Vorbis dla ClanLiba
Group: Development/Libraries
-Requires: %{name}-Vorbis = %{version}
-Requires: %{name}-devel = %{version}
+Requires: %{name}-Vorbis = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+Requires: libvorbis-devel
%description Vorbis-devel
-Headers files for Vorbis ClanLib library.
+Header files for Vorbis ClanLib library.
%description Vorbis-devel -l pl
Pliki nag³ówkowe biblioteki Vorbis dla ClanLiba.
@@ -189,7 +244,7 @@ Pliki nag
Summary: Static Vorbis ClanLib library
Summary(pl): Statyczna biblioteka Vorbis dla ClanLiba
Group: Development/Libraries
-Requires: %{name}-Vorbis-devel = %{version}
+Requires: %{name}-Vorbis-devel = %{version}-%{release}
%description Vorbis-static
Static Vorbis ClanLib library.
@@ -197,52 +252,17 @@ Static Vorbis ClanLib library.
%description Vorbis-static -l pl
Statyczna biblioteka Vorbis dla ClanLiba.
-%package TTF
-Summary: TTF ClanLib library
-Summary(pl): Biblioteka TTF dla ClanLiba
-Group: Libraries
-Requires: %{name} = %{version}
-
-%description TTF
-TTF ClanLib library.
-
-%description TTF -l pl
-Biblioteka TTF dla ClanLiba.
-
-%package TTF-devel
-Summary: Headers files for TTF ClanLib library
-Summary(pl): Pliki nag³ówkowe biblioteki TTF dla ClanLiba
-Group: Development/Libraries
-Requires: %{name}-TTF = %{version}
-Requires: %{name}-devel = %{version}
-
-%description TTF-devel
-Headers files for TTF ClanLib library.
-
-%description TTF-devel -l pl
-Pliki nag³ówkowe biblioteki TTF dla ClanLiba.
-
-%package TTF-static
-Summary: Static TTF ClanLib library
-Summary(pl): Statyczna biblioteka TTF dla ClanLiba
-Group: Development/Libraries
-Requires: %{name}-TTF-devel = %{version}
-
-%description TTF-static
-Static TTF ClanLib library.
-
-%description TTF-static -l pl
-Statyczna biblioteka TTF dla ClanLiba.
-
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+
+rm -rf autom4te.cache
%build
# note: rtti is needed --- ClanLib uses exceptions!
+%{__libtoolize}
%{__aclocal}
+%{__automake}
%{__autoconf}
%configure \
--enable-static \
@@ -251,101 +271,98 @@ Statyczna biblioteka TTF dla ClanLiba.
%ifarch %{ix86}
--enable-asm386 \
%endif
- --enable-clansound \
- --enable-dyn \
- --enable-fbdev \
- --enable-gui \
- --enable-jpeg \
- --enable-mikmod \
- --enable-network \
- --enable-opengl \
- --enable-png \
- --enable-smalljpeg \
- --enable-ttf \
- --enable-vidmode \
- --enable-vorbis \
- --enable-x11 \
- --disable-lua \
- --disable-directfb
-# lua is broken, DirectFB too fresh?
+ --enable-dyn
+# directfb disabled now
%{__make}
-%{__make} docs
%install
rm -rf $RPM_BUILD_ROOT
+
%{__make} install \
- LIB_PREFIX="$RPM_BUILD_ROOT%{_libdir}" \
- TARGET_PREFIX="$RPM_BUILD_ROOT%{_libdir}/ClanLib" \
- BIN_PREFIX="$RPM_BUILD_ROOT%{_bindir}" \
- INC_PREFIX="$RPM_BUILD_ROOT%{_includedir}"
+ DESTDIR=$RPM_BUILD_ROOT
-%{__make} docs_install \
- MAN_PREFIX="$RPM_BUILD_ROOT%{_mandir}" \
- HTML_PREFIX="`pwd`/html"
+# missing from make install
+install -d $RPM_BUILD_ROOT%{_aclocaldir}
+install Setup/Unix/clanlib.m4 $RPM_BUILD_ROOT%{_aclocaldir}
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
-%post OpenGL -p /sbin/ldconfig
-%postun OpenGL -p /sbin/ldconfig
+%post OpenGL -p /sbin/ldconfig
+%postun OpenGL -p /sbin/ldconfig
-%post MikMod -p /sbin/ldconfig
-%postun MikMod -p /sbin/ldconfig
+%post MikMod -p /sbin/ldconfig
+%postun MikMod -p /sbin/ldconfig
-%post TTF -p /sbin/ldconfig
-%postun TTF -p /sbin/ldconfig
+%post SDL -p /sbin/ldconfig
+%postun SDL -p /sbin/ldconfig
-%post Vorbis -p /sbin/ldconfig
-%postun Vorbis -p /sbin/ldconfig
+%post Vorbis -p /sbin/ldconfig
+%postun Vorbis -p /sbin/ldconfig
%files
%defattr(644,root,root,755)
-%doc CREDITS
-%attr(755,root,root) %{_libdir}/libclanApp.so.*.*
-%attr(755,root,root) %{_libdir}/libclanCore.so.*.*
-%attr(755,root,root) %{_libdir}/libclanDisplay.so.*.*
-%attr(755,root,root) %{_libdir}/libclanGUI.so.*.*
-%attr(755,root,root) %{_libdir}/libclan*JPEG.so.*.*
-%attr(755,root,root) %{_libdir}/libclanNetwork.so.*.*
-%attr(755,root,root) %{_libdir}/libclanPNG.so.*.*
-%attr(755,root,root) %{_libdir}/libclanSound.so.*.*
+%doc COPYING CREDITS NEWS README README.sdl TODO-RSN
+%attr(755,root,root) %{_libdir}/libclanApp-0.8.so.*.*
+%attr(755,root,root) %{_libdir}/libclanCore-0.8.so.*.*
+%attr(755,root,root) %{_libdir}/libclanDisplay-0.8.so.*.*
+%attr(755,root,root) %{_libdir}/libclanGUI-0.8.so.*.*
+%attr(755,root,root) %{_libdir}/libclanGUIStyleSilver-0.8.so.*.*
+%attr(755,root,root) %{_libdir}/libclanNetwork-0.8.so.*.*
+%attr(755,root,root) %{_libdir}/libclanSignals-0.8.so.*.*
+%attr(755,root,root) %{_libdir}/libclanSound-0.8.so.*.*
%files devel
%defattr(644,root,root,755)
-%doc README html
-%attr(755,root,root) %{_bindir}/clanlib-config
+%doc README.kdevelop README.upgrade
%attr(755,root,root) %{_libdir}/libclanApp.so
%attr(755,root,root) %{_libdir}/libclanCore.so
%attr(755,root,root) %{_libdir}/libclanDisplay.so
%attr(755,root,root) %{_libdir}/libclanGUI.so
-%attr(755,root,root) %{_libdir}/libclan*JPEG.so
+%attr(755,root,root) %{_libdir}/libclanGUIStyleSilver.so
%attr(755,root,root) %{_libdir}/libclanNetwork.so
-%attr(755,root,root) %{_libdir}/libclanPNG.so
+%attr(755,root,root) %{_libdir}/libclanSignals.so
%attr(755,root,root) %{_libdir}/libclanSound.so
-%dir %{_includedir}/ClanLib
-%{_includedir}/ClanLib/Application
-%{_includedir}/ClanLib/Core
-%{_includedir}/ClanLib/Display
-%{_includedir}/ClanLib/GUI
-%{_includedir}/ClanLib/*JPEG
-%{_includedir}/ClanLib/Network
-%{_includedir}/ClanLib/PNG
-%{_includedir}/ClanLib/Signals
-%{_includedir}/ClanLib/Sound
-%{_includedir}/ClanLib/application.h
-%{_includedir}/ClanLib/core.h
-%{_includedir}/ClanLib/display.h
-%{_includedir}/ClanLib/efence.h
-%{_includedir}/ClanLib/gui.h
-%{_includedir}/ClanLib/jpeg.h
-%{_includedir}/ClanLib/network.h
-%{_includedir}/ClanLib/png.h
-%{_includedir}/ClanLib/signals.h
-%{_includedir}/ClanLib/sound.h
+%{_libdir}/libclanApp.la
+%{_libdir}/libclanCore.la
+%{_libdir}/libclanDisplay.la
+%{_libdir}/libclanGUI.la
+%{_libdir}/libclanGUIStyleSilver.la
+%{_libdir}/libclanNetwork.la
+%{_libdir}/libclanSignals.la
+%{_libdir}/libclanSound.la
+%dir %{_includedir}/ClanLib-0.8
+%dir %{_includedir}/ClanLib-0.8/ClanLib
+%{_includedir}/ClanLib-0.8/ClanLib/Application
+%{_includedir}/ClanLib-0.8/ClanLib/application.h
+%{_includedir}/ClanLib-0.8/ClanLib/Core
+%{_includedir}/ClanLib-0.8/ClanLib/core.h
+%{_includedir}/ClanLib-0.8/ClanLib/Display
+%{_includedir}/ClanLib-0.8/ClanLib/display.h
+%{_includedir}/ClanLib-0.8/ClanLib/GUI*
+%{_includedir}/ClanLib-0.8/ClanLib/gui*.h
+%{_includedir}/ClanLib-0.8/ClanLib/Network
+%{_includedir}/ClanLib-0.8/ClanLib/network.h
+%{_includedir}/ClanLib-0.8/ClanLib/Signals
+%{_includedir}/ClanLib-0.8/ClanLib/signals.h
+%{_includedir}/ClanLib-0.8/ClanLib/Sound
+%{_includedir}/ClanLib-0.8/ClanLib/sound.h
+%{_aclocaldir}/*.m4
+%{_pkgconfigdir}/clanApp-0.8.pc
+%{_pkgconfigdir}/clanCore-0.8.pc
+%{_pkgconfigdir}/clanDisplay-0.8.pc
+%{_pkgconfigdir}/clanGUI*-0.8.pc
+%{_pkgconfigdir}/clanNetwork-0.8.pc
+%{_pkgconfigdir}/clanSignals-0.8.pc
+%{_pkgconfigdir}/clanSound-0.8.pc
+
+%files doc
+%defattr(644,root,root,755)
+%{_docdir}/clanlib
%files static
%defattr(644,root,root,755)
@@ -353,20 +370,22 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libclanCore.a
%{_libdir}/libclanDisplay.a
%{_libdir}/libclanGUI.a
-%{_libdir}/libclan*JPEG.a
+%{_libdir}/libclanGUIStyleSilver.a
%{_libdir}/libclanNetwork.a
-%{_libdir}/libclanPNG.a
+%{_libdir}/libclanSignals.a
%{_libdir}/libclanSound.a
%files OpenGL
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanGL.so.*.*
+%attr(755,root,root) %{_libdir}/libclanGL-0.8.so.*.*
%files OpenGL-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libclanGL.so
-%{_includedir}/ClanLib/GL
-%{_includedir}/ClanLib/gl.h
+%{_libdir}/libclanGL.la
+%{_includedir}/ClanLib-0.8/ClanLib/GL
+%{_includedir}/ClanLib-0.8/ClanLib/gl.h
+%{_pkgconfigdir}/clanGL-0.8.pc
%files OpenGL-static
%defattr(644,root,root,755)
@@ -374,42 +393,48 @@ rm -rf $RPM_BUILD_ROOT
%files MikMod
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanMikMod.so.*.*
+%attr(755,root,root) %{_libdir}/libclanMikMod-0.8.so.*.*
%files MikMod-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libclanMikMod.so
-%{_includedir}/ClanLib/MikMod
-%{_includedir}/ClanLib/mikmod.h
+%{_libdir}/libclanMikMod.la
+%{_includedir}/ClanLib-0.8/ClanLib/MikMod
+%{_includedir}/ClanLib-0.8/ClanLib/mikmod.h
+%{_pkgconfigdir}/clanMikMod-0.8.pc
%files MikMod-static
%defattr(644,root,root,755)
%{_libdir}/libclanMikMod.a
-%files Vorbis
+%files SDL
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanVorbis.so.*.*
+%attr(755,root,root) %{_libdir}/libclanSDL-0.8.so.*.*
-%files Vorbis-devel
+%files SDL-devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanVorbis.so
-%{_includedir}/ClanLib/Vorbis
-%{_includedir}/ClanLib/vorbis.h
+%attr(755,root,root) %{_libdir}/libclanSDL.so
+%{_libdir}/libclanSDL.la
+%{_includedir}/ClanLib-0.8/ClanLib/SDL
+%{_includedir}/ClanLib-0.8/ClanLib/sdl.h
+%{_pkgconfigdir}/clanSDL-0.8.pc
-%files Vorbis-static
+%files SDL-static
%defattr(644,root,root,755)
-%{_libdir}/libclanVorbis.a
+%{_libdir}/libclanSDL.a
-%files TTF
+%files Vorbis
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanTTF.so.*.*
+%attr(755,root,root) %{_libdir}/libclanVorbis-0.8.so.*.*
-%files TTF-devel
+%files Vorbis-devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanTTF.so
-%{_includedir}/ClanLib/TTF
-%{_includedir}/ClanLib/ttf.h
+%attr(755,root,root) %{_libdir}/libclanVorbis.so
+%{_libdir}/libclanVorbis.la
+%{_includedir}/ClanLib-0.8/ClanLib/Vorbis
+%{_includedir}/ClanLib-0.8/ClanLib/vorbis.h
+%{_pkgconfigdir}/clanVorbis-0.8.pc
-%files TTF-static
+%files Vorbis-static
%defattr(644,root,root,755)
-%{_libdir}/libclanTTF.a
+%{_libdir}/libclanVorbis.a
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
packages/ClanLib
More information about the test
mailing list