From 845467236035bbe6709dd61dccc0363901f89d90 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Tue, 5 Nov 2013 20:24:55 +0100 Subject: [PATCH] - updated link patch - updated files and packages --- ClanLib-link.patch | 202 +++++++++++++-------------- ClanLib.spec | 334 ++++++++++++--------------------------------- 2 files changed, 194 insertions(+), 342 deletions(-) diff --git a/ClanLib-link.patch b/ClanLib-link.patch index 4bd9968..a389132 100644 --- a/ClanLib-link.patch +++ b/ClanLib-link.patch @@ -1,13 +1,13 @@ --- ClanLib-2.2.7/Sources/Core/Makefile.am.orig 2010-07-19 09:10:06.000000000 +0200 +++ ClanLib-2.2.7/Sources/Core/Makefile.am 2011-03-26 14:43:21.808912129 +0100 @@ -164,7 +164,7 @@ + endif - # FIXME: Hardcoding these here might not be a good idea --libclan23Core_la_LIBADD = @LIBPTHREAD@ -+libclan23Core_la_LIBADD = @LIBPTHREAD@ -lpthread +-libclan30Core_la_LIBADD = @LIBPTHREAD@ ++libclan30Core_la_LIBADD = @LIBPTHREAD@ -lpthread - libclan23Core_la_LDFLAGS = \ + libclan30Core_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ --- ClanLib-2.2.7/Sources/Network/Makefile.am.orig 2011-01-27 09:46:22.000000000 +0100 +++ ClanLib-2.2.7/Sources/Network/Makefile.am 2011-03-26 14:55:17.676908777 +0100 @@ -15,13 +15,13 @@ setupnetwork_unix.cpp endif -+libclan23Network_la_LIBADD = $(top_builddir)/Sources/Core/libclan23Core.la - libclan23Network_la_LDFLAGS = \ ++libclan30Network_la_LIBADD = $(top_builddir)/Sources/Core/libclan30Core.la + libclan30Network_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ - $(extra_LIBS_Network) + $(extra_LIBS_clanNetwork) - libclan23Sound_la_CXXFLAGS=$(Network_CXXFLAGS) $(extra_CFLAGS_Network) + libclan30Sound_la_CXXFLAGS=$(Network_CXXFLAGS) $(extra_CFLAGS_Network) --- ClanLib-2.2.7/Sources/Sound/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 +++ ClanLib-2.2.7/Sources/Sound/Makefile.am 2011-03-26 14:45:51.348911291 +0100 @@ -29,8 +29,8 @@ SoundProviders/Unix/soundprovider_recorder_oss.h endif -+libclan23Sound_la_LIBADD = $(top_builddir)/Sources/Core/libclan23Core.la - libclan23Sound_la_LDFLAGS = \ ++libclan30Sound_la_LIBADD = $(top_builddir)/Sources/Core/libclan30Core.la + libclan30Sound_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ $(extra_LIBS_clanSound) --- ClanLib-2.2.7/Sources/CSSLayout/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 @@ -39,94 +39,38 @@ precomp.cpp \ precomp.h -+libclan23CSSLayout_la_LIBADD = $(top_builddir)/Sources/Display/libclan23Display.la $(top_builddir)/Sources/Core/libclan23Core.la - libclan23CSSLayout_la_LDFLAGS = \ ++libclan30CSSLayout_la_LIBADD = $(top_builddir)/Sources/Display/libclan30Display.la $(top_builddir)/Sources/Core/libclan30Core.la + libclan30CSSLayout_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ $(extra_LIBS_clanCSSLayout) ---- ClanLib-2.2.7/Sources/RegExp/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 -+++ ClanLib-2.2.7/Sources/RegExp/Makefile.am 2011-03-26 14:49:19.388910453 +0100 -@@ -5,9 +5,10 @@ - regexp.cpp \ - regexp_match.cpp - -+libclan23RegExp_la_LIBADD = $(top_builddir)/Sources/Core/libclan23Core.la - libclan23RegExp_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ -- $(extra_LIBS_RegExp) -+ $(extra_LIBS_clanRegExp) - - libclan23Sound_la_CXXFLAGS=$(RegExp_CXXFLAGS) $(extra_CFLAGS_RegExp) - ---- ClanLib-2.2.7/Sources/MikMod/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 -+++ ClanLib-2.2.7/Sources/MikMod/Makefile.am 2011-03-26 14:51:37.044906262 +0100 -@@ -8,11 +8,11 @@ - soundprovider_mikmod.cpp \ - soundprovider_mikmod_session.cpp - --libclan23MikMod_la_LIBADD = -lmikmod -+libclan23MikMod_la_LIBADD = $(top_builddir)/Sources/Sound/libclan23Sound.la $(top_builddir)/Sources/Core/libclan23Core.la -lmikmod - - libclan23MikMod_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ -- $(extra_LIBS_MikMod) -+ $(extra_LIBS_clanMikMod) - - libclan23Sound_la_CXXFLAGS=$(MikMod_CXXFLAGS) $(extra_CFLAGS_MikMod) - ---- ClanLib-2.2.7/Sources/GL1/Makefile.am.orig 2011-01-27 09:46:22.000000000 +0100 -+++ ClanLib-2.2.7/Sources/GL1/Makefile.am 2011-03-26 14:55:25.660907939 +0100 -@@ -41,6 +41,7 @@ - GLX/gl1_window_provider_glx.cpp \ - GLX/gl1_window_provider_glx.h - endif -+libclan23GL1_la_LIBADD = $(top_builddir)/Sources/Display/libclan23Display.la $(top_builddir)/Sources/Core/libclan23Core.la - libclan23GL1_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ - $(extra_LIBS_clanGL1) --- ClanLib-2.2.7/Sources/GL/Makefile.am.orig 2011-01-27 09:46:22.000000000 +0100 +++ ClanLib-2.2.7/Sources/GL/Makefile.am 2011-03-26 14:57:45.268909615 +0100 @@ -48,6 +48,7 @@ GLX/opengl_window_provider_glx.cpp \ GLX/opengl_window_provider_glx.h endif -+libclan23GL_la_LIBADD = $(top_builddir)/Sources/Display/libclan23Display.la $(top_builddir)/Sources/Core/libclan23Core.la - libclan23GL_la_LDFLAGS = \ ++libclan30GL_la_LIBADD = $(top_builddir)/Sources/Display/libclan30Display.la $(top_builddir)/Sources/Core/libclan30Core.la + libclan30GL_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ $(extra_LIBS_clanGL) ---- ClanLib-2.2.7/Sources/Vorbis/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 -+++ ClanLib-2.2.7/Sources/Vorbis/Makefile.am 2011-03-26 14:59:38.508911291 +0100 -@@ -5,11 +5,11 @@ - soundprovider_vorbis.cpp \ - soundprovider_vorbis_session.cpp - --libclan23Vorbis_la_LIBADD = -logg -lvorbis -+libclan23Vorbis_la_LIBADD = $(top_builddir)/Sources/Sound/libclan23Sound.la $(top_builddir)/Sources/Core/libclan23Core.la -logg -lvorbis - - libclan23Vorbis_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ -- $(extra_LIBS_Vorbis) -+ $(extra_LIBS_clanVorbis) - - libclan23Sound_la_CXXFLAGS=$(Vorbis_CXXFLAGS) $(extra_CFLAGS_Vorbis) - --- ClanLib-2.2.7/Sources/Database/Makefile.am.orig 2010-11-01 09:26:08.000000000 +0100 +++ ClanLib-2.2.7/Sources/Database/Makefile.am 2011-03-26 15:00:40.788912129 +0100 @@ -8,6 +8,7 @@ db_value.cpp \ db_transaction.cpp -+libclan23Database_la_LIBADD = $(top_builddir)/Sources/Core/libclan23Core.la - libclan23Database_la_LDFLAGS = \ ++libclan30Database_la_LIBADD = $(top_builddir)/Sources/Core/libclan30Core.la + libclan30Database_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ $(extra_LIBS_clanDatabase) --- ClanLib-2.2.7/Sources/App/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 +++ ClanLib-2.2.7/Sources/App/Makefile.am 2011-03-26 15:01:37.480908777 +0100 @@ -6,6 +6,7 @@ - libclan23App_la_SOURCES = Unix/clanapp.cpp + libclan30App_la_SOURCES = Unix/clanapp.cpp endif -+libclan23App_la_LIBADD = $(top_builddir)/Sources/Core/libclan23Core.la - libclan23App_la_LDFLAGS = \ ++libclan30App_la_LIBADD = $(top_builddir)/Sources/Core/libclan30Core.la + libclan30App_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ $(extra_LIBS_clanApp) --- ClanLib-2.2.7/Sources/GUI/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 @@ -135,8 +79,8 @@ gui_theme_default_impl.h \ precomp.h -+libclan23GUI_la_LIBADD = $(top_builddir)/Sources/CSSLayout/libclan23CSSLayout.la $(top_builddir)/Sources/Display/libclan23Display.la $(top_builddir)/Sources/Core/libclan23Core.la - libclan23GUI_la_LDFLAGS = \ ++libclan30GUI_la_LIBADD = $(top_builddir)/Sources/CSSLayout/libclan30CSSLayout.la $(top_builddir)/Sources/Display/libclan30Display.la $(top_builddir)/Sources/Core/libclan30Core.la + libclan30GUI_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ $(extra_LIBS_clanGUI) --- ClanLib-2.2.7/Sources/Sqlite/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 @@ -145,31 +89,31 @@ sqlite_reader_provider.cpp \ sqlite_transaction_provider.cpp -+libclan23Sqlite_la_LIBADD = $(top_builddir)/Sources/Database/libclan23Database.la $(top_builddir)/Sources/Core/libclan23Core.la -lpthread -lsqlite3 - libclan23Sqlite_la_LDFLAGS = \ ++libclan30Sqlite_la_LIBADD = $(top_builddir)/Sources/Database/libclan30Database.la $(top_builddir)/Sources/Core/libclan30Core.la -lpthread -lsqlite3 + libclan30Sqlite_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ - $(extra_LIBS_Sqlite) + $(extra_LIBS_clanSqlite) - libclan23Sound_la_CXXFLAGS=$(Sqlite_CXXFLAGS) $(extra_CFLAGS_Sqlite) + libclan30Sound_la_CXXFLAGS=$(Sqlite_CXXFLAGS) $(extra_CFLAGS_Sqlite) --- ClanLib-2.3.1/Sources/Display/Makefile.am.orig 2011-07-26 11:43:05.000000000 +0200 +++ ClanLib-2.3.1/Sources/Display/Makefile.am 2011-08-10 09:48:40.939755410 +0200 @@ -1,6 +1,7 @@ - lib_LTLIBRARIES = libclan23Display.la + lib_LTLIBRARIES = libclan30Display.la if WIN32 -+libclan23Display_la_LIBADD = ++libclan30Display_la_LIBADD = else - libclan23Display_la_LIBADD = -lpng -ljpeg + libclan30Display_la_LIBADD = -lpng -ljpeg endif @@ -201,7 +202,7 @@ X11/font_config.cpp \ X11/font_config.h endif - -+libclan23Display_la_LIBADD += $(top_builddir)/Sources/Core/libclan23Core.la $(clanDisplay_LIBS) - libclan23Display_la_LDFLAGS = \ ++libclan30Display_la_LIBADD += $(top_builddir)/Sources/Core/libclan30Core.la $(clanDisplay_LIBS) + libclan30Display_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ $(extra_LIBS_clanDisplay --- ClanLib-2.2.7/Sources/SWRender/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 @@ -178,13 +122,13 @@ Canvas/Commands/pixel_command_triangle.cpp \ swr_target.cpp -+libclan23SWRender_la_LIBADD = $(top_builddir)/Sources/Display/libclan23Display.la $(top_builddir)/Sources/Core/libclan23Core.la - libclan23SWRender_la_LDFLAGS = \ ++libclan30SWRender_la_LIBADD = $(top_builddir)/Sources/Display/libclan30Display.la $(top_builddir)/Sources/Core/libclan30Core.la + libclan30SWRender_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ - $(extra_LIBS_SWRender) + $(extra_LIBS_clanSWRender) - libclan23Sound_la_CXXFLAGS=$(SWRender_CXXFLAGS) $(extra_CFLAGS_SWRender) + libclan30Sound_la_CXXFLAGS=$(SWRender_CXXFLAGS) $(extra_CFLAGS_SWRender) --- ClanLib-2.2.7/configure.ac.orig 2011-01-27 09:46:22.000000000 +0100 +++ ClanLib-2.2.7/configure.ac 2011-03-26 15:25:57.540910453 +0100 @@ -213,22 +157,82 @@ if test "$enable_clanDisplay" = "yes"; then CLANLIB_ENABLE_MODULES(Display) -@@ -670,14 +674,14 @@ - CLANLIB_ENABLE_MODULES(GL1) +@@ -681,14 +686,14 @@ + if test "$enable_clanGL" = "yes"; then + CLANLIB_ENABLE_MODULES(GL) fi ++if test "$enable_clanCSSLayout" = "yes"; then ++ CLANLIB_ENABLE_MODULES(CSSLayout) ++fi --if test "$enable_clanGUI" = "yes"; then -- CLANLIB_ENABLE_MODULES(GUI) --fi -- - if test "$enable_clanCSSLayout" = "yes"; then - CLANLIB_ENABLE_MODULES(CSSLayout) + if test "$enable_clanGUI" = "yes"; then + CLANLIB_ENABLE_MODULES(GUI) fi -+if test "$enable_clanGUI" = "yes"; then -+ CLANLIB_ENABLE_MODULES(GUI) -+fi -+ +-if test "$enable_clanCSSLayout" = "yes"; then +- CLANLIB_ENABLE_MODULES(CSSLayout) +-fi if test "$enable_clanSWRender" = "yes"; then CLANLIB_ENABLE_MODULES(SWRender) fi +--- ClanLib-3.0.0/Sources/Compute/Makefile.am.orig 2013-11-05 19:30:01.877180958 +0100 ++++ ClanLib-3.0.0/Sources/Compute/Makefile.am 2013-11-05 19:30:17.203847516 +0100 +@@ -21,6 +21,7 @@ + compute_program.cpp \ + setup_compute.cpp + ++libclan30Compute_la_LIBADD = $(top_builddir)/Sources/Core/libclan30Core.la $(top_builddir)/Sources/GL/libclan30GL.la + libclan30Compute_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ + $(extra_LIBS_Compute) +--- ClanLib-3.0.0/Sources/Scene3D/Makefile.am.orig 2013-11-05 19:33:55.787179266 +0100 ++++ ClanLib-3.0.0/Sources/Scene3D/Makefile.am 2013-11-05 19:34:39.483845615 +0100 +@@ -46,6 +46,7 @@ + Performance/gpu_timer.cpp \ + Performance/scope_timer.cpp + ++libclan30Scene3D_la_LIBADD = $(top_builddir)/Sources/Core/libclan30Core.la $(top_builddir)/Sources/GL/libclan30GL.la + libclan30Scene3D_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ + $(extra_LIBS_clanScene3D) +--- ClanLib-3.0.0/Sources/Physics3D/Makefile.am.orig 2013-11-05 19:35:36.817178534 +0100 ++++ ClanLib-3.0.0/Sources/Physics3D/Makefile.am 2013-11-05 19:35:51.530511761 +0100 +@@ -137,6 +137,7 @@ + physics3d_ray_test.cpp \ + physics3d_contact_test.cpp + ++libclan30Physics3D_la_LIBADD = $(top_builddir)/Sources/Core/libclan30Core.la + libclan30Physics3D_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ + $(extra_LIBS_clanPhysics3D) +--- ClanLib-3.0.0/Sources/Physics2D/Makefile.am.orig 2013-09-24 13:53:31.000000000 +0200 ++++ ClanLib-3.0.0/Sources/Physics2D/Makefile.am 2013-11-05 19:37:26.527177740 +0100 +@@ -82,6 +82,7 @@ + Collision/Shapes/circle_shape.cpp \ + Collision/physics_object.cpp + ++libclan30Physics2D_la_LIBADD = $(top_builddir)/Sources/Display/libclan30Display.la $(top_builddir)/Sources/Core/libclan30Core.la + libclan30Physics2D_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ + $(extra_LIBS_clanPhysics2D) +--- ClanLib-3.0.0/Sources/GameIDE/Makefile.am.orig 2013-11-05 19:38:08.570510770 +0100 ++++ ClanLib-3.0.0/Sources/GameIDE/Makefile.am 2013-11-05 19:39:03.023843708 +0100 +@@ -157,6 +157,7 @@ + TextEditor/Scintilla/lexlib/LexerModule.cxx + endif + ++libclan30GameIDE_la_LIBADD = $(top_builddir)/Sources/GUI/libclan30GUI.la + libclan30GameIDE_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ + $(extra_LIBS_clanGameIDE) +--- /home/users/baggins/devel/PLD/rpm/BUILD/ClanLib-3.0.0/Sources/Scene3D/Passes/GBuffer/gbuffer_pass.cpp~ 2013-09-24 13:53:31.000000000 +0200 ++++ /home/users/baggins/devel/PLD/rpm/BUILD/ClanLib-3.0.0/Sources/Scene3D/Passes/GBuffer/gbuffer_pass.cpp 2013-11-05 20:08:58.168398046 +0100 +@@ -35,7 +35,7 @@ + + namespace clan + { +- ++extern cl_tls_variable GLFunctions *OpenGL::functions; + + GBufferPass::GBufferPass(ResourceContainer &inout) + { diff --git a/ClanLib.spec b/ClanLib.spec index 17f8393..91a69a8 100644 --- a/ClanLib.spec +++ b/ClanLib.spec @@ -6,7 +6,7 @@ %define with_sse2 1 %endif # -%define cvmajor 2.3 +%define cvmajor 3.0 Summary: ClanLib, the platform independent game SDK Summary(pl.UTF-8): ClanLib, niezależny od platformy SDK do gier Summary(pt_BR.UTF-8): SDK Clanlib @@ -29,11 +29,9 @@ BuildRequires: doxygen BuildRequires: fontconfig-devel BuildRequires: freetype-devel >= 2 BuildRequires: libjpeg-devel -BuildRequires: libmikmod-devel BuildRequires: libpng-devel >= 1.2 BuildRequires: libstdc++-devel BuildRequires: libtool >= 2:1.4d-3 -BuildRequires: libvorbis-devel >= 1:1.0 BuildRequires: libxslt-progs BuildRequires: pcre-devel BuildRequires: perl-base @@ -44,10 +42,13 @@ BuildRequires: xorg-lib-libXxf86vm-devel BuildRequires: zlib-devel %{?with_sse2:Requires: cpuinfo(sse2)} Obsoletes: ClanLib-SDL +Obsoletes: ClanLib-Vorbis +Obsoletes: ClanLib-MikMod Obsoletes: ClanLib-TTF +Obsoletes: ClanLib-OpenGL1 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _noautoreqdep libGL.so.1 libGLU.so.1 +%define _noautoreqdep libGL.so.1 libGLU.so.1 %description The ClanLib SDK is designed to provide an platform independent game @@ -77,7 +78,10 @@ Requires: libstdc++-devel # for libclanDisplay Requires: xorg-lib-libXxf86vm-devel Obsoletes: ClanLib-SDL-devel +Obsoletes: ClanLib-Vorbis-devel Obsoletes: ClanLib-TTF-devel +Obsoletes: ClanLib-MikMod-devel +Obsoletes: ClanLib-OpenGL1-devel %description devel This is the development add-on package that includes the header files @@ -97,7 +101,10 @@ Summary(pl.UTF-8): Statyczne biblioteki ClanLib Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Obsoletes: ClanLib-SDL-static +Obsoletes: ClanLib-Vorbis-static Obsoletes: ClanLib-TTF-static +Obsoletes: ClanLib-MikMod-static +Obsoletes: ClanLib-OpenGL1-static %description static This package contains static versions of ClanLib libraries. @@ -145,84 +152,6 @@ Static OpenGL ClanLib library. %description OpenGL-static -l pl.UTF-8 Statyczna biblioteka OpenGL dla ClanLiba. -%package OpenGL1 -Summary: OpenGL1 ClanLib library -Summary(pl.UTF-8): Biblioteka OpenGL1 dla ClanLiba -Group: Libraries -Requires: %{name} = %{version}-%{release} - -%description OpenGL1 -OpenGL1 ClanLib library. - -%description OpenGL1 -l pl.UTF-8 -Biblioteka OpenGL1 dla ClanLiba. - -%package OpenGL1-devel -Summary: Header files for OpenGL1 ClanLib library -Summary(pl.UTF-8): Pliki nagłówkowe biblioteki OpenGL1 dla ClanLiba -Group: Development/Libraries -Requires: %{name}-OpenGL1 = %{version}-%{release} -Requires: %{name}-devel = %{version}-%{release} -Requires: OpenGL-GLU-devel -Requires: xorg-lib-libXi-devel -Requires: xorg-lib-libXxf86vm-devel - -%description OpenGL1-devel -Header files for OpenGL1 ClanLib library. - -%description OpenGL1-devel -l pl.UTF-8 -Pliki nagłówkowe biblioteki OpenGL1 dla ClanLiba. - -%package OpenGL1-static -Summary: Static OpenGL1 ClanLib library -Summary(pl.UTF-8): Statyczna biblioteka OpenGL1 dla ClanLiba -Group: Development/Libraries -Requires: %{name}-OpenGL1-devel = %{version}-%{release} - -%description OpenGL1-static -Static OpenGL1 ClanLib library. - -%description OpenGL1-static -l pl.UTF-8 -Statyczna biblioteka OpenGL1 dla ClanLiba. - -%package MikMod -Summary: MikMod ClanLib library -Summary(pl.UTF-8): Biblioteka MikMod dla ClanLiba -Group: Libraries -Requires: %{name} = %{version}-%{release} - -%description MikMod -MikMod ClanLib library. - -%description MikMod -l pl.UTF-8 -Biblioteka MikMod dla ClanLiba. - -%package MikMod-devel -Summary: Header files for MikMod ClanLib library -Summary(pl.UTF-8): Pliki nagłówkowe biblioteki MikMod dla ClanLiba -Group: Development/Libraries -Requires: %{name}-MikMod = %{version}-%{release} -Requires: %{name}-devel = %{version}-%{release} -Requires: libmikmod-devel - -%description MikMod-devel -Header files for MikMod ClanLib library. - -%description MikMod-devel -l pl.UTF-8 -Pliki nagłówkowe biblioteki MikMod dla ClanLiba. - -%package MikMod-static -Summary: Static MikMod ClanLib library -Summary(pl.UTF-8): Statyczna biblioteka MikMod dla ClanLiba -Group: Development/Libraries -Requires: %{name}-MikMod-devel = %{version}-%{release} - -%description MikMod-static -Static MikMod ClanLib library. - -%description MikMod-static -l pl.UTF-8 -Statyczna biblioteka MikMod dla ClanLiba. - %package SWRender Summary: ClanLib SWRender (Software Rendering) library Summary(pl.UTF-8): Biblioteka ClanLib SWRender (Software Rendering) @@ -273,44 +202,6 @@ Static ClanLib SWRender library. %description SWRender-static -l pl.UTF-8 Statyczna biblioteka ClanLib SWRender. -%package Vorbis -Summary: Vorbis ClanLib library -Summary(pl.UTF-8): Biblioteka Vorbis dla ClanLiba -Group: Libraries -Requires: %{name} = %{version}-%{release} - -%description Vorbis -Vorbis ClanLib library. - -%description Vorbis -l pl.UTF-8 -Biblioteka Vorbis dla ClanLiba. - -%package Vorbis-devel -Summary: Header files for Vorbis ClanLib library -Summary(pl.UTF-8): Pliki nagłówkowe biblioteki Vorbis dla ClanLiba -Group: Development/Libraries -Requires: %{name}-Vorbis = %{version}-%{release} -Requires: %{name}-devel = %{version}-%{release} -Requires: libvorbis-devel - -%description Vorbis-devel -Header files for Vorbis ClanLib library. - -%description Vorbis-devel -l pl.UTF-8 -Pliki nagłówkowe biblioteki Vorbis dla ClanLiba. - -%package Vorbis-static -Summary: Static Vorbis ClanLib library -Summary(pl.UTF-8): Statyczna biblioteka Vorbis dla ClanLiba -Group: Development/Libraries -Requires: %{name}-Vorbis-devel = %{version}-%{release} - -%description Vorbis-static -Static Vorbis ClanLib library. - -%description Vorbis-static -l pl.UTF-8 -Statyczna biblioteka Vorbis dla ClanLiba. - %package doc Summary: ClanLib reference documentation for programmers Summary(pl.UTF-8): Dokumentacja programisty do biblioteki ClanLib @@ -364,64 +255,57 @@ rm -rf $RPM_BUILD_ROOT %post OpenGL -p /sbin/ldconfig %postun OpenGL -p /sbin/ldconfig -%post OpenGL1 -p /sbin/ldconfig -%postun OpenGL1 -p /sbin/ldconfig - -%post MikMod -p /sbin/ldconfig -%postun MikMod -p /sbin/ldconfig - %post SWRender -p /sbin/ldconfig %postun SWRender -p /sbin/ldconfig -%post Vorbis -p /sbin/ldconfig -%postun Vorbis -p /sbin/ldconfig - %files %defattr(644,root,root,755) %doc COPYING CREDITS README -%attr(755,root,root) %{_libdir}/libclan23App-%{cvmajor}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libclan23App-%{cvmajor}.so.1 -%attr(755,root,root) %{_libdir}/libclan23Core-%{cvmajor}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libclan23CSSLayout-%{cvmajor}.so.1 -%attr(755,root,root) %{_libdir}/libclan23CSSLayout-%{cvmajor}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libclan23Core-%{cvmajor}.so.1 -%attr(755,root,root) %{_libdir}/libclan23Database-%{cvmajor}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libclan23Database-%{cvmajor}.so.1 -%attr(755,root,root) %{_libdir}/libclan23Display-%{cvmajor}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libclan23Display-%{cvmajor}.so.1 -%attr(755,root,root) %{_libdir}/libclan23GUI-%{cvmajor}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libclan23GUI-%{cvmajor}.so.1 -%attr(755,root,root) %{_libdir}/libclan23Network-%{cvmajor}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libclan23Network-%{cvmajor}.so.1 -%attr(755,root,root) %{_libdir}/libclan23RegExp-%{cvmajor}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libclan23RegExp-%{cvmajor}.so.1 -%attr(755,root,root) %{_libdir}/libclan23Sound-%{cvmajor}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libclan23Sound-%{cvmajor}.so.1 -%attr(755,root,root) %{_libdir}/libclan23Sqlite-%{cvmajor}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libclan23Sqlite-%{cvmajor}.so.1 +%attr(755,root,root) %{_libdir}/libclan30App-%{cvmajor}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libclan30App-%{cvmajor}.so.1 +%attr(755,root,root) %{_libdir}/libclan30Core-%{cvmajor}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libclan30CSSLayout-%{cvmajor}.so.1 +%attr(755,root,root) %{_libdir}/libclan30CSSLayout-%{cvmajor}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libclan30Core-%{cvmajor}.so.1 +%attr(755,root,root) %{_libdir}/libclan30Database-%{cvmajor}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libclan30Database-%{cvmajor}.so.1 +%attr(755,root,root) %{_libdir}/libclan30Display-%{cvmajor}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libclan30Display-%{cvmajor}.so.1 +%attr(755,root,root) %{_libdir}/libclan30GUI-%{cvmajor}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libclan30GUI-%{cvmajor}.so.1 +%attr(755,root,root) %{_libdir}/libclan30Network-%{cvmajor}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libclan30Network-%{cvmajor}.so.1 +%attr(755,root,root) %{_libdir}/libclan30Sound-%{cvmajor}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libclan30Sound-%{cvmajor}.so.1 +%attr(755,root,root) %{_libdir}/libclan30Sqlite-%{cvmajor}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libclan30Sqlite-%{cvmajor}.so.1 +%attr(755,root,root) %{_libdir}/libclan30Compute-%{cvmajor}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libclan30Compute-%{cvmajor}.so.1 +%attr(755,root,root) %{_libdir}/libclan30GameIDE-%{cvmajor}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libclan30GameIDE-%{cvmajor}.so.1 +%attr(755,root,root) %{_libdir}/libclan30Physics2D-%{cvmajor}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libclan30Physics2D-%{cvmajor}.so.1 +%attr(755,root,root) %{_libdir}/libclan30Physics3D-%{cvmajor}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libclan30Physics3D-%{cvmajor}.so.1 +%attr(755,root,root) %{_libdir}/libclan30Scene3D-%{cvmajor}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libclan30Scene3D-%{cvmajor}.so.1 %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libclan23App.so -%attr(755,root,root) %{_libdir}/libclan23CSSLayout.so -%attr(755,root,root) %{_libdir}/libclan23Core.so -%attr(755,root,root) %{_libdir}/libclan23Database.so -%attr(755,root,root) %{_libdir}/libclan23Display.so -%attr(755,root,root) %{_libdir}/libclan23GUI.so -%attr(755,root,root) %{_libdir}/libclan23Network.so -%attr(755,root,root) %{_libdir}/libclan23RegExp.so -%attr(755,root,root) %{_libdir}/libclan23Sound.so -%attr(755,root,root) %{_libdir}/libclan23Sqlite.so -%{_libdir}/libclan23App.la -%{_libdir}/libclan23CSSLayout.la -%{_libdir}/libclan23Core.la -%{_libdir}/libclan23Database.la -%{_libdir}/libclan23Display.la -%{_libdir}/libclan23GUI.la -%{_libdir}/libclan23Network.la -%{_libdir}/libclan23RegExp.la -%{_libdir}/libclan23Sound.la -%{_libdir}/libclan23Sqlite.la +%attr(755,root,root) %{_libdir}/libclan30App.so +%attr(755,root,root) %{_libdir}/libclan30CSSLayout.so +%attr(755,root,root) %{_libdir}/libclan30Core.so +%attr(755,root,root) %{_libdir}/libclan30Database.so +%attr(755,root,root) %{_libdir}/libclan30Display.so +%attr(755,root,root) %{_libdir}/libclan30GUI.so +%attr(755,root,root) %{_libdir}/libclan30Network.so +%attr(755,root,root) %{_libdir}/libclan30Sound.so +%attr(755,root,root) %{_libdir}/libclan30Sqlite.so +%attr(755,root,root) %{_libdir}/libclan30Compute.so +%attr(755,root,root) %{_libdir}/libclan30GameIDE.so +%attr(755,root,root) %{_libdir}/libclan30Physics2D.so +%attr(755,root,root) %{_libdir}/libclan30Physics3D.so +%attr(755,root,root) %{_libdir}/libclan30Scene3D.so %dir %{_includedir}/ClanLib-%{cvmajor} %dir %{_includedir}/ClanLib-%{cvmajor}/ClanLib %{_includedir}/ClanLib-%{cvmajor}/ClanLib/App @@ -438,12 +322,21 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/ClanLib-%{cvmajor}/ClanLib/gui*.h %{_includedir}/ClanLib-%{cvmajor}/ClanLib/Network %{_includedir}/ClanLib-%{cvmajor}/ClanLib/network.h -%{_includedir}/ClanLib-%{cvmajor}/ClanLib/RegExp -%{_includedir}/ClanLib-%{cvmajor}/ClanLib/regexp.h %{_includedir}/ClanLib-%{cvmajor}/ClanLib/Sound %{_includedir}/ClanLib-%{cvmajor}/ClanLib/sound.h %{_includedir}/ClanLib-%{cvmajor}/ClanLib/Sqlite %{_includedir}/ClanLib-%{cvmajor}/ClanLib/sqlite.h +%{_includedir}/ClanLib-%{cvmajor}/ClanLib/Compute +%{_includedir}/ClanLib-%{cvmajor}/ClanLib/GameIDE +%{_includedir}/ClanLib-%{cvmajor}/ClanLib/Physics2D +%{_includedir}/ClanLib-%{cvmajor}/ClanLib/Physics3D +%{_includedir}/ClanLib-%{cvmajor}/ClanLib/Scene3D +%{_includedir}/ClanLib-%{cvmajor}/ClanLib/compute.h +%{_includedir}/ClanLib-%{cvmajor}/ClanLib/d3d.h +%{_includedir}/ClanLib-%{cvmajor}/ClanLib/gameide.h +%{_includedir}/ClanLib-%{cvmajor}/ClanLib/physics2d.h +%{_includedir}/ClanLib-%{cvmajor}/ClanLib/physics3d.h +%{_includedir}/ClanLib-%{cvmajor}/ClanLib/scene3d.h %{_aclocaldir}/clanlib.m4 %{_pkgconfigdir}/clanApp-%{cvmajor}.pc %{_pkgconfigdir}/clanCSSLayout-%{cvmajor}.pc @@ -452,107 +345,62 @@ rm -rf $RPM_BUILD_ROOT %{_pkgconfigdir}/clanDisplay-%{cvmajor}.pc %{_pkgconfigdir}/clanGUI*-%{cvmajor}.pc %{_pkgconfigdir}/clanNetwork-%{cvmajor}.pc -%{_pkgconfigdir}/clanRegExp-%{cvmajor}.pc %{_pkgconfigdir}/clanSound-%{cvmajor}.pc %{_pkgconfigdir}/clanSqlite-%{cvmajor}.pc +%{_pkgconfigdir}/clanCompute-%{cvmajor}.pc +%{_pkgconfigdir}/clanGameIDE-%{cvmajor}.pc +%{_pkgconfigdir}/clanPhysics2D-%{cvmajor}.pc +%{_pkgconfigdir}/clanPhysics3D-%{cvmajor}.pc +%{_pkgconfigdir}/clanScene3D-%{cvmajor}.pc %files static %defattr(644,root,root,755) -%{_libdir}/libclan23App.a -%{_libdir}/libclan23CSSLayout.a -%{_libdir}/libclan23Core.a -%{_libdir}/libclan23Database.a -%{_libdir}/libclan23Display.a -%{_libdir}/libclan23GUI.a -%{_libdir}/libclan23Network.a -%{_libdir}/libclan23RegExp.a -%{_libdir}/libclan23Sound.a -%{_libdir}/libclan23Sqlite.a +%{_libdir}/libclan30App.a +%{_libdir}/libclan30CSSLayout.a +%{_libdir}/libclan30Core.a +%{_libdir}/libclan30Database.a +%{_libdir}/libclan30Display.a +%{_libdir}/libclan30GUI.a +%{_libdir}/libclan30Network.a +%{_libdir}/libclan30Sound.a +%{_libdir}/libclan30Sqlite.a +%{_libdir}/libclan30Compute.a +%{_libdir}/libclan30GameIDE.a +%{_libdir}/libclan30Physics2D.a +%{_libdir}/libclan30Physics3D.a +%{_libdir}/libclan30Scene3D.a %files OpenGL %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libclan23GL-%{cvmajor}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libclan23GL-%{cvmajor}.so.1 +%attr(755,root,root) %{_libdir}/libclan30GL-%{cvmajor}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libclan30GL-%{cvmajor}.so.1 %files OpenGL-devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libclan23GL.so -%{_libdir}/libclan23GL.la +%attr(755,root,root) %{_libdir}/libclan30GL.so %{_includedir}/ClanLib-%{cvmajor}/ClanLib/GL %{_includedir}/ClanLib-%{cvmajor}/ClanLib/gl.h %{_pkgconfigdir}/clanGL-%{cvmajor}.pc %files OpenGL-static %defattr(644,root,root,755) -%{_libdir}/libclan23GL.a - -%files OpenGL1 -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libclan23GL1-%{cvmajor}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libclan23GL1-%{cvmajor}.so.1 - -%files OpenGL1-devel -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libclan23GL1.so -%{_libdir}/libclan23GL1.la -%{_includedir}/ClanLib-%{cvmajor}/ClanLib/GL1 -%{_includedir}/ClanLib-%{cvmajor}/ClanLib/gl1.h -%{_pkgconfigdir}/clanGL1-%{cvmajor}.pc - -%files OpenGL1-static -%defattr(644,root,root,755) -%{_libdir}/libclan23GL1.a - -%files MikMod -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libclan23MikMod-%{cvmajor}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libclan23MikMod-%{cvmajor}.so.1 - -%files MikMod-devel -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libclan23MikMod.so -%{_libdir}/libclan23MikMod.la -%{_includedir}/ClanLib-%{cvmajor}/ClanLib/MikMod -%{_includedir}/ClanLib-%{cvmajor}/ClanLib/mikmod.h -%{_pkgconfigdir}/clanMikMod-%{cvmajor}.pc - -%files MikMod-static -%defattr(644,root,root,755) -%{_libdir}/libclan23MikMod.a +%{_libdir}/libclan30GL.a %files SWRender %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libclan23SWRender-%{cvmajor}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libclan23SWRender-%{cvmajor}.so.1 +%attr(755,root,root) %{_libdir}/libclan30SWRender-%{cvmajor}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libclan30SWRender-%{cvmajor}.so.1 %files SWRender-devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libclan23SWRender.so -%{_libdir}/libclan23SWRender.la +%attr(755,root,root) %{_libdir}/libclan30SWRender.so %{_includedir}/ClanLib-%{cvmajor}/ClanLib/SWRender %{_includedir}/ClanLib-%{cvmajor}/ClanLib/swrender.h %{_pkgconfigdir}/clanSWRender-%{cvmajor}.pc %files SWRender-static %defattr(644,root,root,755) -%{_libdir}/libclan23SWRender.a - -%files Vorbis -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libclan23Vorbis-%{cvmajor}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libclan23Vorbis-%{cvmajor}.so.1 - -%files Vorbis-devel -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libclan23Vorbis.so -%{_libdir}/libclan23Vorbis.la -%{_includedir}/ClanLib-%{cvmajor}/ClanLib/Vorbis -%{_includedir}/ClanLib-%{cvmajor}/ClanLib/vorbis.h -%{_pkgconfigdir}/clanVorbis-%{cvmajor}.pc - -%files Vorbis-static -%defattr(644,root,root,755) -%{_libdir}/libclan23Vorbis.a +%{_libdir}/libclan30SWRender.a %files doc %defattr(644,root,root,755) -- 2.44.0