[meego-commits] 5135: Changes to Trunk:Testing/sqlite
Zhu, Peter J
peter.j.zhu at intel.com
Thu Jul 1 03:50:01 UTC 2010
> -----Original Message-----
> From: meego-commits-bounces at meego.com
> [mailto:meego-commits-bounces at meego.com] On Behalf Of Yi Yang
> Sent: Thursday, July 01, 2010 9:42 AM
> To: meego-commits at meego.com
> Subject: [meego-commits] 5135: Changes to Trunk:Testing/sqlite
>
> Hi,
> I have made the following changes to sqlite in project Trunk:Testing. Please
> review and accept ASAP.
>
> Thank You,
> Yi Yang
>
> [This message was auto-generated]
>
> ---
>
> Request #5135:
>
> submit: home:yyang:branches:Trunk:Testing/sqlite(r2)(cleanup) ->
> Trunk:Testing/sqlite
>
>
> Message:
> Fix BMC #3176 (BuildRequires:tcl is necessary)
>
> State: new 2010-06-30T13:38:01 yyang
> Comment: None
>
>
>
> changes files:
> --------------
> --- sqlite.changes
> +++ sqlite.changes
> @@ -0,0 +1,3 @@
> +* Mon Jun 28 2010 Yi Yang <yi.y.yang at intel.com> - 3.6.22
> +- Set bigger depth of the LALR(1) stack (BMC #3176)
> +
>
> new:
> ----
> Makefile
> sqlite.yaml
>
> spec files:
> -----------
> --- sqlite.spec
> +++ sqlite.spec
> @@ -1,20 +1,27 @@
> -#specfile originally created for Fedora, modified for Moblin Linux
> -Summary: Library that implements an embeddable SQL database engine
> +#
> +# Do not Edit! Generated by:
> +# spectacle version 0.17
> +#
> +# >> macros
> +# << macros
> +
> Name: sqlite
> +Summary: Library that implements an embeddable SQL database engine
> Version: 3.6.22
> Release: 1
> -License: Public Domain
> Group: Applications/Databases
> +License: Public Domain
> URL: http://www.sqlite.org/download.html
> -Source: http://www.sqlite.org/sqlite-%{version}.tar.gz
> -# Fix build with --enable-load-extension, upstream ticket #3137
> -Patch1: sqlite-3.6.12-libdl.patch
> -# Avoid insecure sprintf(), use a system path for lempar.c, patch from Debian
> -Patch2: sqlite-3.6.6.2-lemon-snprintf.patch
> -# Disable two tests failing on at least on x86_64, ticket #3951
> -Patch3: sqlite-3.6.17-tkt3951.patch
> -BuildRequires: readline-devel tcl
> -BuildRoot: %{_tmppath}/%{name}-root
> +Source0: http://www.sqlite.org/sqlite-%{version}.tar.gz
> +Source100: sqlite.yaml
> +Patch0: sqlite-3.6.12-libdl.patch
> +Patch1: sqlite-3.6.6.2-lemon-snprintf.patch
> +Patch2: sqlite-3.6.17-tkt3951.patch
> +Requires(post): /sbin/ldconfig
> +Requires(postun): /sbin/ldconfig
> +BuildRequires: readline-devel
> +BuildRequires: tcl
> +
>
> %description
> SQLite is a C library that implements an SQL database engine. A large
> @@ -25,6 +32,8 @@
> supporting a separate database server. Version 2 and version 3 binaries
> are named to permit each to be installed on a single host
>
> +
> +
> %package devel
> Summary: Development tools for the sqlite3 embeddable SQL database
> engine
> Group: Development/Libraries
> @@ -35,41 +44,71 @@
> for %{name}. If you like to develop programs using %{name}, you will need
> to install %{name}-devel.
>
> -%prep
> -%setup -q
>
> -%patch1 -p1 -b .libdl
> -%patch2 -p1 -b .lemon-sprintf
> -%patch3 -p1 -b .tkt3951
>
> +%prep
> +%setup -q -n %{name}-%{version}
>
> +# sqlite-3.6.12-libdl.patch
> +%patch0 -p1
> +# sqlite-3.6.6.2-lemon-snprintf.patch
> +%patch1 -p1
> +# sqlite-3.6.17-tkt3951.patch
> +%patch2 -p1
> +# >> setup
> +# << setup
>
> %build
> -export CFLAGS="$RPM_OPT_FLAGS
> -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1
> -Wall"
> -%reconfigure --disable-tcl \
> +# >> build pre
> +export CFLAGS="$RPM_OPT_FLAGS
> -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1
> -DYYSTACKDEPTH=500 -Wall"
> +# << build pre
> +
> +%reconfigure --disable-static \
> + --disable-tcl \
> --enable-threadsafe \
> --enable-threads-override-locks
> -make %{?_smp_mflags}
>
> +make %{?jobs:-j%jobs}
> +
> +# >> build post
> +# << build post
> %install
> -rm -rf $RPM_BUILD_ROOT
> +rm -rf %{buildroot}
> +# >> install pre
>
> +# << install pre
> %make_install
>
> -%clean
> +# >> install post
> +
> +# << install post
> +
> +
>
> %post -p /sbin/ldconfig
>
> %postun -p /sbin/ldconfig
>
> +
> +
> +
> +
> %files
> +%defattr(-,root,root,-)
> +# >> files
> %defattr(-, root, root)
> %doc README
> %{_bindir}/*
> %{_libdir}/*.so.*
> +# << files
> +
>
> %files devel
> +%defattr(-,root,root,-)
> +# >> files devel
> %defattr(-, root, root)
> %{_includedir}/*.h
> %{_libdir}/*.so
> %{_libdir}/pkgconfig/*.pc
> +# << files devel
> +
>
> other changes:
> --------------
>
> ++++++ Makefile (new)
> --- Makefile
> +++ Makefile
> +PKG_NAME := sqlite
> +SPECFILE = $(addsuffix .spec, $(PKG_NAME))
> +YAMLFILE = $(addsuffix .yaml, $(PKG_NAME))
> +
> +include /usr/share/packaging-tools/Makefile.common
> +
>
> ++++++ sqlite.yaml (new)
> --- sqlite.yaml
> +++ sqlite.yaml
> +Name: sqlite
> +Summary: Library that implements an embeddable SQL database engine
> +Version: 3.6.22
> +Release: 1
> +Group: Applications/Databases
> +License: Public Domain
> +URL: http://www.sqlite.org/download.html
> +Sources:
> + - http://www.sqlite.org/sqlite-%{version}.tar.gz
> +Patches:
> + - sqlite-3.6.12-libdl.patch
> + - sqlite-3.6.6.2-lemon-snprintf.patch
> + - sqlite-3.6.17-tkt3951.patch
> +Description: |
> + SQLite is a C library that implements an SQL database engine. A large
> + subset of SQL92 is supported. A complete database is stored in a
> + single disk file. The API is designed for convenience and ease of use.
> + Applications that link against SQLite can enjoy the power and
> + flexibility of an SQL database without the administrative hassles of
> + supporting a separate database server. Version 2 and version 3
> binaries
> + are named to permit each to be installed on a single host
> +
> +PkgBR:
> + - readline-devel
> + - tcl
Since we disable tcl in configure, why do we still need tcl in BR?
Please use pkgconfig(readline)
> +Configure: reconfigure
> +ConfigOptions:
> + - --disable-tcl
> + - --enable-threadsafe
> + - --enable-threads-override-locks
> +Builder: make
> +SubPackages:
> + - Name: devel
> + Summary: Development tools for the sqlite3 embeddable SQL
> database engine
> + Group: Development/Libraries
> + Description: |
> + This package contains the header files and development
> documentation
> + for %{name}. If you like to develop programs using %{name}, you
> will need
> + to install %{name}-devel.
> +
> _______________________________________________
> Meego-commits mailing list
> Meego-commits at meego.com
> http://lists.meego.com/listinfo/meego-commits
More information about the MeeGo-commits
mailing list