rpms/gambas/FC-3 gambas-1.0.13-gettextfix.patch, NONE, 1.1 gambas.spec, 1.8, 1.9 sources, 1.5, 1.6
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Fri Nov 18 16:19:07 UTC 2005
Author: spot
Update of /cvs/extras/rpms/gambas/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26866/FC-3
Modified Files:
gambas.spec sources
Added Files:
gambas-1.0.13-gettextfix.patch
Log Message:
Bump to 1.0.13, modify packaging to match upstream "standard", fix gettext detection
gambas-1.0.13-gettextfix.patch:
--- NEW FILE gambas-1.0.13-gettextfix.patch ---
--- gambas-1.0.13/configure.BAD 2005-11-17 18:50:33.000000000 -0600
+++ gambas-1.0.13/configure 2005-11-17 18:50:40.000000000 -0600
@@ -22634,7 +22634,7 @@
gb_val=""
gb_save=`pwd`
-gb_file_list="gettextlib.$SHLIBEXT"
+gb_file_list="libgettextlib.$SHLIBEXT"
for gb_main_dir in /usr/local /usr; do
if test -d $gb_main_dir; then
--- gambas-1.0.13/configure.in.BAD 2005-11-18 10:03:15.000000000 -0600
+++ gambas-1.0.13/configure.in 2005-11-18 10:03:24.000000000 -0600
@@ -138,7 +138,7 @@
GETTEXT,
[external gettext library],
[],
- [GB_FIND(gettextlib.$SHLIBEXT, /usr/local /usr, lib)],
+ [GB_FIND(libgettextlib.$SHLIBEXT, /usr/local /usr, lib)],
[-lgettextlib])
dnl ---- Checks for components
Index: gambas.spec
===================================================================
RCS file: /cvs/extras/rpms/gambas/FC-3/gambas.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gambas.spec 5 Sep 2005 15:12:26 -0000 1.8
+++ gambas.spec 18 Nov 2005 16:19:04 -0000 1.9
@@ -1,6 +1,6 @@
Name: gambas
Summary: IDE based on a basic interpreter with object extensions
-Version: 1.0.11
+Version: 1.0.13
Release: 1%{?dist}
License: GPL
Group: Development/Tools
@@ -9,7 +9,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kdelibs-devel, automake, autoconf, SDL-devel
BuildRequires: mysql-devel, postgresql-devel, sqlite2-devel
-BuildRequires: desktop-file-utils
+BuildRequires: desktop-file-utils, gettext-devel
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
# Code is not 64 bit clean.
@@ -20,39 +20,188 @@
Patch1: gambas-1.0.6-dont-make-links.patch
Patch2: gambas-1.0.6-noopt.patch
Patch3: gambas-1.0.11-desktopfix.patch
+Patch4: gambas-1.0.13-gettextfix.patch
%description
Gambas is a free development environment based on a Basic interpreter
+with object extensions, like Visual Basic (but it is NOT a clone !).
+With Gambas, you can quickly design your program GUI, access MySQL or
+PostgreSQL databases, pilot KDE applications with DCOP, translate your
+program into many languages, create network applications easily, and so
+on...
+
+%package runtime
+Summary: Runtime environment for gambas
+Group: Development/Tools
+Provides: %{name} = %{version}-%{release}
+Obsoletes: %{name}
+
+
+%description runtime
+Gambas is a free development environment based on a Basic interpreter
with object extensions, like Visual Basic (but it is NOT a clone !).
With Gambas, you can quickly design your program GUI, access MySQL or
PostgreSQL databases, pilot KDE applications with DCOP, translate your
program into many languages, create network applications easily, and so
on...
-%package devel
-Summary: Development libraries and headers for gambas
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-The gambas-devel package contains the development libraries and
-headers for gambas.
-
-%package help
-Summary: Help files for gambas
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description help
-The gambas-help package contains all the help files for gambas.
-
-%package examples
-Summary: Examples for gambas
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+%package ide
+Summary: Development environment for gambas
+Group: Development/Tools
+Requires: %{name}-runtime = %{version}-%{release}
+Requires: %{name}-gb-compress = %{version}-%{release}
+Requires: %{name}-gb-db = %{version}-%{release}
+Requires: %{name}-gb-debug = %{version}-%{release}
+Requires: %{name}-gb-eval = %{version}-%{release}
+Requires: %{name}-gb-net-curl = %{version}-%{release}
+Requires: %{name}-gb-net = %{version}-%{release}
+Requires: %{name}-gb-qt = %{version}-%{release}
+Requires: %{name}-gb-qt-editor = %{version}-%{release}
+Requires: %{name}-gb-qt-ext = %{version}-%{release}
+Requires: %{name}-gb-qt-kde = %{version}-%{release}
+Requires: %{name}-gb-qt-kde-html = %{version}-%{release}
+Requires: %{name}-gb-sdl = %{version}-%{release}
+Requires: %{name}-gb-vb = %{version}-%{release}
+Requires: %{name}-gb-xml-libxml = %{version}-%{release}
+Requires: %{name}-gb-xml-libxml-rpc = %{version}-%{release}
+Requires: %{name}-gb-xml-libxml-xslt = %{version}-%{release}
+Provides: %{name}-devel = %{version}-%{release}
+Obsoletes: %{name}-devel, %{name}-help, %{name}-examples
+Provides: %{name}-help = %{version}-%{release}
+Provides: %{name}-examples = %{version}-%{release}
+
+%description ide
+The gambas-runtime package contains the complete Gambas Development
+Environment, with the database manager, the help files, and all components.
+
+%package gb-compress
+Summary: Gambas component package for net
+Group: Development/Tools
+Requires: %{name}-runtime = %{version}-%{release}
+
+%description gb-compress
+%{summary}
+
+%package gb-db
+Summary: Gambas component package for db
+Group: Development/Tools
+Requires: %{name}-runtime = %{version}-%{release}
+
+%description gb-db
+%{summary}
+
+%package gb-debug
+Summary: Gambas component package for debug
+Group: Development/Tools
+Requires: %{name}-runtime = %{version}-%{release}
+
+%description gb-debug
+%{summary}
+
+%package gb-eval
+Summary: Gambas component package for eval
+Group: Development/Tools
+Requires: %{name}-runtime = %{version}-%{release}
+
+%description gb-eval
+%{summary}
+
+%package gb-net
+Summary: Gambas component package for net
+Group: Development/Tools
+Requires: %{name}-runtime = %{version}-%{release}
+
+%description gb-net
+%{summary}
+
+%package gb-net-curl
+Summary: Gambas component package for net.curl
+Group: Development/Tools
+Requires: %{name}-runtime = %{version}-%{release}
+
+%description gb-net-curl
+%{summary}
+
+%package gb-qt
+Summary: Gambas component package for qt
+Group: Development/Tools
+Requires: %{name}-runtime = %{version}-%{release}
+
+%description gb-qt
+%{summary}
+
+%package gb-qt-editor
+Summary: Gambas component package for qt.editor
+Group: Development/Tools
+Requires: %{name}-runtime = %{version}-%{release}
+
+%description gb-qt-editor
+%{summary}
+
+%package gb-qt-ext
+Summary: Gambas component package for qt.ext
+Group: Development/Tools
+Requires: %{name}-runtime = %{version}-%{release}
+
+%description gb-qt-ext
+%{summary}
+
+%package gb-qt-kde
+Summary: Gambas component package for qt.kde
+Group: Development/Tools
+Requires: %{name}-runtime = %{version}-%{release}
+
+%description gb-qt-kde
+%{summary}
+
+%package gb-qt-kde-html
+Summary: Gambas component package for qt.kde.html
+Group: Development/Tools
+Requires: %{name}-runtime = %{version}-%{release}
+
+%description gb-qt-kde-html
+%{summary}
+
+%package gb-sdl
+Summary: Gambas component package for sdl
+Group: Development/Tools
+Requires: %{name}-runtime = %{version}-%{release}
+
+%description gb-sdl
+%{summary}
+
+%package gb-vb
+Summary: Gambas component package for vb
+Group: Development/Tools
+Requires: %{name}-runtime = %{version}-%{release}
+
+%description gb-vb
+%{summary}
+
+%package gb-xml-libxml
+Summary: Gambas component package for xml.libxml
+Group: Development/Tools
+Requires: %{name}-runtime = %{version}-%{release}
+
+%description gb-xml-libxml
+%{summary}
+
+%package gb-xml-libxml-rpc
+Summary: Gambas component package for xml.libxml.rpc
+Group: Development/Tools
+Requires: %{name}-runtime = %{version}-%{release}
+
+%description gb-xml-libxml-rpc
+%{summary}
+
+%package gb-xml-libxml-xslt
+Summary: Gambas component package for xml.libxml.xslt
+Group: Development/Tools
+Requires: %{name}-runtime = %{version}-%{release}
+
+%description gb-xml-libxml-xslt
+%{summary}
-%description examples
-The gambas-examples package contains some examples for gambas.
%prep
%setup -q
@@ -60,6 +209,8 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
+
%build
# Gambas can't deal with -Wp,-D_FORTIFY_SOURCE=2
@@ -86,7 +237,8 @@
rm -rf $RPM_BUILD_ROOT
export PATH=$RPM_BUILD_ROOT/usr/bin:$PATH
make DESTDIR=$RPM_BUILD_ROOT install
-rm -rf $RPM_BUILD_ROOT%{_libdir}/gambas/*.la
+# Yes, I know. Normally we'd nuke the .la files, but Gambas is retar^Wspecial.
+# rm -rf $RPM_BUILD_ROOT%{_libdir}/gambas/*.la
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
install -m0644 ./app/gambas/.icon/32.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/gambas.png
@@ -110,38 +262,162 @@
update-desktop-database %{_datadir}/applications &> /dev/null
fi
-%files
+%files runtime
%defattr(-, root, root, 0755)
%doc AUTHORS COPYING INSTALL README README.REDHAT TODO
-# Normally the .so file should be in the -devel package
-# However, gambas can't run without it. :P
-%{_libdir}/gambas
+%dir %{_libdir}/gambas
+%{_libdir}/gambas/lib.gb.component
%{_bindir}/gambas
-%{_bindir}/gbc
-%{_bindir}/gba
%{_bindir}/gbi
%{_bindir}/gbx
-%{_bindir}/gambas-database-manager
%{_datadir}/pixmaps/gambas.png
%{_datadir}/applications/*.desktop
+%dir %{_datadir}/gambas/info
+%{_datadir}/gambas/info/gb.info
+%{_datadir}/gambas/info/gb.list
-%files devel
+%files ide
%defattr(-, root, root, 0755)
+%{_bindir}/gbc
+%{_bindir}/gba
+%{_bindir}/gambas-database-manager
%{_includedir}/gambas.h
-%dir %{_datadir}/gambas/
-%{_datadir}/gambas/info
+%{_datadir}/gambas/
+%exclude %{_datadir}/gambas/info/
+
+# For what its worth, I think this packaging layout is horrific.
+# But, I'm going to play nice with upstream and let the user suffer.
+# ~spot
+
+%files gb-compress
+%defattr(-, root, root, 0755)
+%dir %{_libdir}/gambas
+%{_libdir}/gambas/lib.gb.compress.*
+%dir %{_datadir}/gambas/info
+%{_datadir}/gambas/info/gb.compress.*
+
+%files gb-db
+%defattr(-, root, root, 0755)
+%dir %{_libdir}/gambas
+%{_libdir}/gambas/lib.gb.db.*
+%dir %{_datadir}/gambas/info
+%{_datadir}/gambas/info/gb.db.*
+
+%files gb-debug
+%defattr(-, root, root, 0755)
+%dir %{_libdir}/gambas
+%{_libdir}/gambas/lib.gb.debug.*
+%dir %{_datadir}/gambas/info
+%{_datadir}/gambas/info/gb.debug.*
+
+%files gb-eval
+%defattr(-, root, root, 0755)
+%dir %{_libdir}/gambas
+%{_libdir}/gambas/lib.gb.eval.*
+%dir %{_datadir}/gambas/info
+%{_datadir}/gambas/info/gb.eval.*
-%files help
-%defattr(-,root,root,0755)
-%dir %{_datadir}/gambas/
-%{_datadir}/gambas/help
-
-%files examples
-%defattr(-,root,root,0755)
-%dir %{_datadir}/gambas/
-%{_datadir}/gambas/examples
+%files gb-net
+%defattr(-, root, root, 0755)
+%dir %{_libdir}/gambas
+%{_libdir}/gambas/lib.gb.net.component
+%{_libdir}/gambas/lib.gb.net.so*
+%{_libdir}/gambas/lib.gb.net.la
+%dir %{_datadir}/gambas/info
+%{_datadir}/gambas/info/gb.net.info
+%{_datadir}/gambas/info/gb.net.list
+
+%files gb-net-curl
+%defattr(-, root, root, 0755)
+%dir %{_libdir}/gambas
+%{_libdir}/gambas/lib.gb.net.curl.*
+%dir %{_datadir}/gambas/info
+%{_datadir}/gambas/info/gb.net.curl.*
+
+%files gb-qt
+%defattr(-, root, root, 0755)
+%dir %{_libdir}/gambas
+%{_libdir}/gambas/lib.gb.qt.component
+%{_libdir}/gambas/lib.gb.qt.so*
+%{_libdir}/gambas/lib.gb.qt.la
+%dir %{_datadir}/gambas/info
+%{_datadir}/gambas/info/gb.qt.info
+%{_datadir}/gambas/info/gb.qt.list
+
+%files gb-qt-editor
+%defattr(-, root, root, 0755)
+%dir %{_libdir}/gambas
+%{_libdir}/gambas/lib.gb.qt.editor.*
+%dir %{_datadir}/gambas/info
+%{_datadir}/gambas/info/gb.qt.editor.*
+
+%files gb-qt-ext
+%defattr(-, root, root, 0755)
+%dir %{_libdir}/gambas
+%{_libdir}/gambas/lib.gb.qt.ext.*
+%dir %{_datadir}/gambas/info
+%{_datadir}/gambas/info/gb.qt.ext.*
+
+%files gb-qt-kde
+%defattr(-, root, root, 0755)
+%dir %{_libdir}/gambas
+%{_libdir}/gambas/lib.gb.qt.kde.component
+%{_libdir}/gambas/lib.gb.qt.kde.so*
+%{_libdir}/gambas/lib.gb.qt.kde.la
+%dir %{_datadir}/gambas/info
+%{_datadir}/gambas/info/gb.qt.kde.info
+%{_datadir}/gambas/info/gb.qt.kde.list
+
+%files gb-qt-kde-html
+%defattr(-, root, root, 0755)
+%dir %{_libdir}/gambas
+%{_libdir}/gambas/lib.gb.qt.kde.html.*
+%dir %{_datadir}/gambas/info
+%{_datadir}/gambas/info/gb.qt.kde.html.*
+
+%files gb-sdl
+%defattr(-, root, root, 0755)
+%dir %{_libdir}/gambas
+%{_libdir}/gambas/lib.gb.sdl.*
+%dir %{_datadir}/gambas/info
+%{_datadir}/gambas/info/gb.sdl.*
+
+%files gb-vb
+%defattr(-, root, root, 0755)
+%dir %{_libdir}/gambas
+%{_libdir}/gambas/lib.gb.vb.*
+%dir %{_datadir}/gambas/info
+%{_datadir}/gambas/info/gb.vb.*
+
+%files gb-xml-libxml
+%defattr(-, root, root, 0755)
+%dir %{_libdir}/gambas
+%{_libdir}/gambas/lib.gb.xml.libxml.component
+%{_libdir}/gambas/lib.gb.xml.libxml.so*
+%{_libdir}/gambas/lib.gb.xml.libxml.la
+%dir %{_datadir}/gambas/info
+%{_datadir}/gambas/info/gb.xml.libxml.info
+%{_datadir}/gambas/info/gb.xml.libxml.list
+
+%files gb-xml-libxml-rpc
+%defattr(-, root, root, 0755)
+%dir %{_libdir}/gambas
+%{_libdir}/gambas/lib.gb.xml.libxml.rpc.*
+%dir %{_datadir}/gambas/info
+%{_datadir}/gambas/info/gb.xml.libxml.rpc.*
+
+%files gb-xml-libxml-xslt
+%defattr(-, root, root, 0755)
+%dir %{_libdir}/gambas
+%{_libdir}/gambas/lib.gb.xml.libxml.xslt.*
+%dir %{_datadir}/gambas/info
+%{_datadir}/gambas/info/gb.xml.libxml.xslt.*
%changelog
+* Thu Nov 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.13-1
+- bump to 1.0.13
+- rework package to upstream standards
+
* Sun Sep 4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.11-1
- bump to 1.0.11
- add gambas.desktop, gambas.png
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gambas/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 5 Sep 2005 15:12:26 -0000 1.5
+++ sources 18 Nov 2005 16:19:04 -0000 1.6
@@ -1,4 +1 @@
-608772c93233eea4e488ba3bd1c2ac83 gambas-1.0.6.tar.bz2
-730b690c72689e26888698233fdef726 gambas-1.0.8.tar.bz2
-888494096dfb4f497dcfed58179980fa gambas-1.0.9.tar.bz2
-819eab8e69f71a76248c2679b3af9946 gambas-1.0.11.tar.bz2
+07cea1f0e9e1f4188b9e88133900bb65 gambas-1.0.13.tar.bz2
More information about the fedora-extras-commits
mailing list