Hi
> -----Original Message-----
> From: [email protected]
> [mailto:[email protected]] On Behalf Of Anas Nashif
> Sent: Sunday, May 01, 2011 8:24 PM
> To: [email protected]
> Subject: [meego-commits] 17295: Changes to Trunk:Testing/tinycdb
>
> Hi,
> I have made the following changes to tinycdb in project Trunk:Testing. Please
> review and accept ASAP.
>
> Thank You,
> Anas Nashif
>
> [This message was auto-generated]
>
> ---
>
> Request #17295:
>
> submit: devel:next/tinycdb(r7) -> Trunk:Testing/tinycdb
>
>
> Message:
> * Sun May 01 2011 Anas Nashif <[email protected]> - 0.77
> - Fixed packaging: Do not change buildroot in %build section (forwarded
> request 17294 from nashif)
>
> State: new 2011-05-01T05:23:48 nashif
> Comment: None
>
>
>
> changes files:
> --------------
> --- tinycdb.changes
> +++ tinycdb.changes
> @@ -0,0 +1,3 @@
> +* Sun May 01 2011 Anas Nashif <[email protected]> - 0.77
> +- Fixed packaging: Do not change buildroot in %build section
> +
>
> old:
> ----
> tinycdb-0.76.tar.gz
>
> new:
> ----
> cflags.patch
> tinycdb_0.77.tar.gz
>
> spec files:
> -----------
> --- tinycdb.spec
> +++ tinycdb.spec
> @@ -1,27 +1,34 @@
> #
> -# Do not Edit! Generated by:
> -# spectacle version 0.13
> +# Do NOT Edit the Auto-generated Part!
> +# Generated by: spectacle version 0.22
> #
> # >> macros
> -%define keepstatic 1
> # << macros
> +%define keepstatic 1
>
> Name: tinycdb
> Summary: Constant Database manipulation library
> -Version: 0.76
> +Version: 0.77
> Release: 1
> Group: System/Libraries
> License: Public Domain
> URL: http://www.corpit.ru/mjt/tinycdb.html
> -Source0: %{name}-%{version}.tar.gz
> +Source0:
> http://www.corpit.ru/mjt/%{name}/%{name}_%{version}.tar.gz
> Source100: tinycdb.yaml
> Patch0: fix-build-prefix.patch
> +Patch1: cflags.patch
> Requires(post): /sbin/ldconfig
> Requires(postun): /sbin/ldconfig
> BuildRequires: pkgconfig(glib-2.0)
>
> +
> %description
> -Description: %{summary}
> +tinycdb is a small, fast and reliable utility and subroutine library for
> +creating and reading constant databases. The database structure is tuned
> +for fast reading.
> +
> +This package contains tinycdb utility and shared library.
> +
>
>
> %package devel
> @@ -30,7 +37,8 @@
> Requires: %{name} = %{version}-%{release}
>
> %description devel
> -Description: %{summary}
> +Development and headers for tinycdb
> +
>
>
> %prep
> @@ -38,7 +46,10 @@
>
> # fix-build-prefix.patch
> %patch0 -p1
> +# cflags.patch
> +%patch1 -p1
> # >> setup
> +sed -i -e 's\/lib\/%{_lib}\g' debian/libcdb.pc
> # << setup
>
> %build
> @@ -48,7 +59,8 @@
>
>
> # >> build post
> -make %{?jobs:-j%jobs} staticlib sharedlib cdb-shared
> +%makeinstall install-sharedlib \
> +INSTALLPROG=cdb-shared CP="cp -p"
> # << build post
> %install
> rm -rf %{buildroot}
> @@ -57,6 +69,11 @@
>
> # >> install post
> make DESTDIR=%{buildroot} install-all install-nss install-piclib
> install-sharedlib
> +chmod +x %{buildroot}%{_libdir}/*.so.*
> +#rm -f %{buildroot}%{_libdir}/lib*.a
> +mkdir -p %{buildroot}%{_libdir}/pkgconfig
> +cp -p debian/libcdb.pc %{buildroot}%{_libdir}/pkgconfig/libcdb.pc
> +file %{buildroot}/usr/lib/libcdb.so.1
> # << install post
>
>
> @@ -67,13 +84,12 @@
>
>
>
> +
> +
> %files
> %defattr(-,root,root,-)
> # >> files
> %{_bindir}/cdb
> -%doc %{_mandir}/man1/cdb*
> -%doc %{_mandir}/man3/cdb*
> -%doc %{_mandir}/man5/cdb*
> /usr/lib/libnss_cdb.so.2
> /usr/lib/libcdb.so.1
> # << files
> @@ -85,7 +101,10 @@
> %{_includedir}/cdb.h
> /usr/lib/libcdb.a
> %config(noreplace) /etc/cdb-Makefile
> -/usr/lib/libcdb.so
> -/usr/lib/libcdb_pic.a
> +%{_libdir}/libcdb.so
> +%{_libdir}/libcdb_pic.a
> +%{_libdir}/libcdb*.a
Why do we need keep the static library?
Peter
> +%{_libdir}/pkgconfig/*.pc
> +%doc %{_mandir}/man*/cdb*
> # << files devel
>
>
> other changes:
> --------------
>
> ++++++ cflags.patch (new)
> --- cflags.patch
> +++ cflags.patch
> +Index: tinycdb-0.77/Makefile
> +==========================================================
> =========
> +--- tinycdb-0.77.orig/Makefile
> ++++ tinycdb-0.77/Makefile
> +@@ -19,7 +19,7 @@ NSSCDB_DIR = $(sysconfdir)
> + DESTDIR=
> +
> + CC = cc
> +-CFLAGS = -O
> ++#CFLAGS = -O
> +
> + AR = ar
> + ARFLAGS = rv
>
> ++++++ tinycdb.yaml
> --- tinycdb.yaml
> +++ tinycdb.yaml
> @@ -1,22 +1,30 @@
> Name: tinycdb
> Summary: Constant Database manipulation library
> -Version: 0.76
> +Version: 0.77
> Release: 1
> Group: System/Libraries
> License: Public Domain
> URL: http://www.corpit.ru/mjt/tinycdb.html
> Sources:
> - - "%{name}-%{version}.tar.gz"
> + - http://www.corpit.ru/mjt/%{name}/%{name}_%{version}.tar.gz
> Patches:
> - fix-build-prefix.patch
> + - cflags.patch
> +Description: |
> + tinycdb is a small, fast and reliable utility and subroutine library for
> + creating and reading constant databases. The database structure is
> tuned
> + for fast reading.
> +
> + This package contains tinycdb utility and shared library.
>
> PkgConfigBR:
> - glib-2.0
> Configure: none
> Builder: none
> -HasStatic: True
> SubPackages:
> - Name: devel
> Summary: Development files for tinycdb
> Group: Development/Libraries
> + Description: |
> + Development and headers for tinycdb
>
>
> ++++++ tinycdb_0.77.tar.gz (new)
>
> ++++++ deleted files:
> --- tinycdb-0.76.tar.gz
>
> _______________________________________________
> MeeGo-commits mailing list
> [email protected]
> http://lists.meego.com/listinfo/meego-commits
_______________________________________________
MeeGo-packaging mailing list
[email protected]
http://lists.meego.com/listinfo/meego-packaging
