From 6b2ffbb41379e33cf0e22ffcac2080da4ce439f0 Mon Sep 17 00:00:00 2001 From: "jk7744.park" Date: Wed, 9 Sep 2015 02:21:07 +0900 Subject: [PATCH] tizen 2.3.1 release --- packaging/Makefile | 6 + packaging/gdbm-1.8.3-no-build-date.patch | 14 --- packaging/gdbm-1.8.3.dif | 16 +-- packaging/gdbm-destdir.patch | 43 +++++++ packaging/gdbm-fix_testprogs.patch | 12 +- packaging/gdbm-protoize_dbm_headers.patch | 10 +- packaging/gdbm-prototype_static_functions.patch | 4 +- packaging/gdbm-stamp.patch | 10 ++ packaging/gdbm.changes | 14 --- packaging/gdbm.manifest | 5 - packaging/gdbm.spec | 146 ++++++++++-------------- packaging/gdbm.yaml | 25 ++++ 12 files changed, 164 insertions(+), 141 deletions(-) create mode 100644 packaging/Makefile delete mode 100644 packaging/gdbm-1.8.3-no-build-date.patch create mode 100644 packaging/gdbm-destdir.patch create mode 100644 packaging/gdbm-stamp.patch delete mode 100644 packaging/gdbm.changes delete mode 100644 packaging/gdbm.manifest create mode 100644 packaging/gdbm.yaml diff --git a/packaging/Makefile b/packaging/Makefile new file mode 100644 index 0000000..05bf9d1 --- /dev/null +++ b/packaging/Makefile @@ -0,0 +1,6 @@ +PKG_NAME := gdbm +SPECFILE = $(addsuffix .spec, $(PKG_NAME)) +YAMLFILE = $(addsuffix .yaml, $(PKG_NAME)) + +include /usr/share/packaging-tools/Makefile.common + diff --git a/packaging/gdbm-1.8.3-no-build-date.patch b/packaging/gdbm-1.8.3-no-build-date.patch deleted file mode 100644 index 5b44fd9..0000000 --- a/packaging/gdbm-1.8.3-no-build-date.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: version.c -=================================================================== ---- version.c.orig 2002-10-16 00:00:42.000000000 +0200 -+++ version.c 2010-08-30 01:41:23.653696000 +0200 -@@ -29,8 +29,4 @@ - #include "autoconf.h" - - /* Keep a string with the version number in it! */ --const char * gdbm_version = "GDBM version 1.8.3. 10/15/2002" --#if defined(__STDC__) && defined(__DATE__) && defined(__TIME__) -- " (built " __DATE__ " " __TIME__ ")" --#endif -- ; -+const char * gdbm_version = "GDBM version 1.8.3. 10/15/2002"; diff --git a/packaging/gdbm-1.8.3.dif b/packaging/gdbm-1.8.3.dif index b0df537..29348f6 100644 --- a/packaging/gdbm-1.8.3.dif +++ b/packaging/gdbm-1.8.3.dif @@ -1,5 +1,5 @@ ---- gdbmopen.c -+++ gdbmopen.c 2005/08/23 08:25:23 +--- a/gdbmopen.c ++++ b/gdbmopen.c 2005/08/23 08:25:23 @@ -212,7 +212,7 @@ file_block_size = block_size; @@ -9,8 +9,8 @@ if (dbf->header == NULL) { gdbm_close (dbf); ---- gdbmreorg.c -+++ gdbmreorg.c 2005/08/24 16:07:12 +--- a/gdbmreorg.c ++++ b/gdbmreorg.c 2005/08/24 16:07:12 @@ -112,7 +112,7 @@ /* Get the mode for the old file and open the new database. */ @@ -20,8 +20,8 @@ fileinfo.st_mode, dbf->fatal_err); if (new_dbf == NULL) ---- Makefile.in -+++ Makefile.in 2005/08/23 08:25:23 +--- a/Makefile.in ++++ b/Makefile.in 2005/08/23 08:25:23 @@ -15,8 +15,8 @@ INSTALL_DATA = @INSTALL_DATA@ @@ -95,8 +95,8 @@ lintgdbm: lint $(DEFS) $(LFLAGS) $(DBM_CF) $(NDBM_CF) $(GDBM_CF) testgdbm.c ---- systems.h -+++ systems.h 2005/08/23 08:25:23 +--- a/systems.h ++++ b/systems.h 2005/08/23 08:25:23 @@ -23,7 +23,7 @@ Computer Science Department Western Washington University diff --git a/packaging/gdbm-destdir.patch b/packaging/gdbm-destdir.patch new file mode 100644 index 0000000..40052b6 --- /dev/null +++ b/packaging/gdbm-destdir.patch @@ -0,0 +1,43 @@ +--- gdbm-1.8.3/Makefile.in.org 2009-02-08 02:26:13.000000000 -0800 ++++ gdbm-1.8.3/Makefile.in 2009-02-08 02:26:36.000000000 -0800 +@@ -127,27 +127,27 @@ all: libgdbm.la libgdbm_compat.la + progs: $(PROGS) + + install: libgdbm.la gdbm.h gdbm.info +- $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ +- $(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \ +- $(INSTALL_ROOT)$(infodir) ++ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) \ ++ $(DESTDIR)$(includedir) $(DESTDIR)$(man3dir) \ ++ $(DESTDIR)$(infodir) + $(LIBTOOL) --mode=install $(INSTALL) -c libgdbm.la \ +- $(INSTALL_ROOT)$(libdir)/libgdbm.la ++ $(DESTDIR)$(libdir)/libgdbm.la + $(INSTALL_DATA) gdbm.h \ +- $(INSTALL_ROOT)$(includedir)/gdbm.h ++ $(DESTDIR)$(includedir)/gdbm.h + $(INSTALL_DATA) $(srcdir)/gdbm.3 \ +- $(INSTALL_ROOT)$(man3dir)/gdbm.3 ++ $(DESTDIR)$(man3dir)/gdbm.3 + $(INSTALL_DATA) $(srcdir)/gdbm.info \ +- $(INSTALL_ROOT)$(infodir)/gdbm.info ++ $(DESTDIR)$(infodir)/gdbm.info + + install-compat: +- $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ +- $(INSTALL_ROOT)$(includedir) ++ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) \ ++ $(DESTDIR)$(includedir) + $(LIBTOOL) --mode=install $(INSTALL) -c libgdbm_compat.la \ +- $(INSTALL_ROOT)$(libdir)/libgdbm_compat.la ++ $(DESTDIR)$(libdir)/libgdbm_compat.la + $(INSTALL_DATA) $(srcdir)/dbm.h \ +- $(INSTALL_ROOT)$(includedir)/dbm.h ++ $(DESTDIR)$(includedir)/dbm.h + $(INSTALL_DATA) $(srcdir)/ndbm.h \ +- $(INSTALL_ROOT)$(includedir)/ndbm.h ++ $(DESTDIR)$(includedir)/ndbm.h + + #libgdbm.a: $(OBJS) gdbm.h + # rm -f libgdbm.a + diff --git a/packaging/gdbm-fix_testprogs.patch b/packaging/gdbm-fix_testprogs.patch index 2872256..ab31d7d 100644 --- a/packaging/gdbm-fix_testprogs.patch +++ b/packaging/gdbm-fix_testprogs.patch @@ -1,5 +1,5 @@ ---- testdbm.c -+++ testdbm.c +--- a/testdbm.c ++++ b/testdbm.c @@ -31,6 +31,9 @@ #include "autoconf.h" @@ -67,8 +67,8 @@ key_data.dptr = key_line; key_data.dsize = strlen (key_line)+1; if (delete (key_data) != 0) ---- testgdbm.c -+++ testgdbm.c +--- a/testgdbm.c ++++ b/testgdbm.c @@ -37,10 +37,22 @@ #include "getopt.h" @@ -92,8 +92,8 @@ gdbm_file_info *gdbm_file; /* Debug procedure to print the contents of the current hash bucket. */ ---- testndbm.c -+++ testndbm.c +--- a/testndbm.c ++++ b/testndbm.c @@ -42,6 +42,9 @@ #if HAVE_FCNTL_H #include diff --git a/packaging/gdbm-protoize_dbm_headers.patch b/packaging/gdbm-protoize_dbm_headers.patch index a8af2d8..ddcad7e 100644 --- a/packaging/gdbm-protoize_dbm_headers.patch +++ b/packaging/gdbm-protoize_dbm_headers.patch @@ -1,5 +1,5 @@ ---- dbm.h -+++ dbm.h +--- a/dbm.h ++++ b/dbm.h @@ -1,7 +1,7 @@ /* dbm.h - The include file for dbm users. */ @@ -49,9 +49,9 @@ +extern datum nextkey __P((datum key)); -extern int dbmclose (); -+extern int dbmclose __P((void)); ---- ndbm.h -+++ ndbm.h ++extern int dbmclose __P((DBM *)); +--- a/ndbm.h ++++ b/ndbm.h @@ -1,7 +1,7 @@ /* ndbm.h - The include file for ndbm users. */ diff --git a/packaging/gdbm-prototype_static_functions.patch b/packaging/gdbm-prototype_static_functions.patch index d672dc1..3cf6b98 100644 --- a/packaging/gdbm-prototype_static_functions.patch +++ b/packaging/gdbm-prototype_static_functions.patch @@ -1,5 +1,5 @@ ---- gdbmseq.c -+++ gdbmseq.c +--- a/gdbmseq.c ++++ b/gdbmseq.c @@ -41,6 +41,8 @@ at ELEM_LOC of the current bucket and using RETURN_VAL as the place to put the data that is found. */ diff --git a/packaging/gdbm-stamp.patch b/packaging/gdbm-stamp.patch new file mode 100644 index 0000000..a2ac7e0 --- /dev/null +++ b/packaging/gdbm-stamp.patch @@ -0,0 +1,10 @@ +--- a/version.c ++++ b/version.c +@@ -31,6 +31,6 @@ + /* Keep a string with the version number in it! */ + const char * gdbm_version = "GDBM version 1.8.3. 10/15/2002" + #if defined(__STDC__) && defined(__DATE__) && defined(__TIME__) +- " (built " __DATE__ " " __TIME__ ")" ++ " (built in 2010)" + #endif + ; diff --git a/packaging/gdbm.changes b/packaging/gdbm.changes deleted file mode 100644 index 1348e17..0000000 --- a/packaging/gdbm.changes +++ /dev/null @@ -1,14 +0,0 @@ -* Sun Jun 24 2012 Anas Nashif 637e5c0 -- re-add manifest - -* Thu Jun 21 2012 Anas Nashif 79a9fd4 -- fixed requirements and add ndbm.h for perl - -* Wed May 30 2012 Ryan Ware 2f3f9e4 -- Add default Smack manifest for gdbm.spec - -* Mon May 21 2012 Kim Kibum 1160f19 -- Upload Tizen:Base source -[ Hyesook Choi ] -- Initial empty repository - diff --git a/packaging/gdbm.manifest b/packaging/gdbm.manifest deleted file mode 100644 index 017d22d..0000000 --- a/packaging/gdbm.manifest +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/packaging/gdbm.spec b/packaging/gdbm.spec index df9a8db..9497c3f 100644 --- a/packaging/gdbm.spec +++ b/packaging/gdbm.spec @@ -1,111 +1,83 @@ -Name: gdbm -Url: http://directory.fsf.org/GNU/gdbm.html -Version: 1.8.3 -Release: 0 -Summary: GNU dbm key/data database -License: GPL-2.0+ -Group: System/Libraries -Source: ftp://prep.ai.mit.edu/gnu/gdbm/gdbm-%{version}.tar.bz2 -Source1001: gdbm.manifest -Patch0: gdbm-%{version}.dif -Patch1: gdbm-protoize_dbm_headers.patch -Patch2: gdbm-prototype_static_functions.patch -Patch3: gdbm-fix_testprogs.patch -Patch4: gdbm-1.8.3-no-build-date.patch -BuildRequires: libtool +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.22 +# + +Name: gdbm +Summary: GNU Database Routines +Version: 1.8.3 +Release: 1 +Group: System/Libraries +License: GPL-2.0+ +URL: http://directory.fsf.org/GNU/gdbm.html +Source0: http://ftp.gnu.org/pub/gnu/gdbm/gdbm-%{version}.tar.bz2 +Source100: gdbm.yaml +Patch0: gdbm-%{version}.dif +Patch1: gdbm-protoize_dbm_headers.patch +Patch2: gdbm-prototype_static_functions.patch +Patch3: gdbm-fix_testprogs.patch +Patch4: gdbm-destdir.patch +Patch5: gdbm-stamp.patch +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + %description -GNU dbm is a library of database functions that use extensible -hashing and work similar to the standard UNIX dbm. These routines are -provided to a programmer needing to create and manipulate a hashed -database. - -The basic use of GDBM is to store key/data pairs in a data file. Each -key must be unique and each key is paired with only one data item. - -The library provides primitives for storing key/data pairs, searching -and retrieving the data by its key and deleting a key along with its -data. It also supports sequential iteration over all key/data pairs in -a database. - -For compatibility with programs using old UNIX dbm functions, the -package also provides traditional dbm and ndbm interfaces. - -%package -n libgdbm -Summary: GNU dbm key/data database -License: GPL-2.0+ -Group: System/Libraries -# O/P added in 12.2 -Obsoletes: gdbm < %version-%release -Provides: gdbm = %version-%release - -%description -n libgdbm -GNU dbm is a library of database functions that use extensible -hashing and work similar to the standard UNIX dbm. These routines are -provided to a programmer needing to create and manipulate a hashed -database. - -The basic use of GDBM is to store key/data pairs in a data file. Each -key must be unique and each key is paired with only one data item. - -The library provides primitives for storing key/data pairs, searching -and retrieving the data by its key and deleting a key along with its -data. It also supports sequential iteration over all key/data pairs in -a database. - -For compatibility with programs using old UNIX dbm functions, the -package also provides traditional dbm and ndbm interfaces. +A static and dynamic library for the GNU database routines. + %package devel -Summary: Include Files and Libraries mandatory for Development -License: GPL-2.0+ ; LGPL-2.1+ -Group: Development/Libraries/C and C++ -Requires: gdbm = %{version} -Provides: gdbm:/usr/lib/libgdbm.so +Summary: Include Files and Libraries mandatory for Development +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} %description devel This package contains all necessary include files and libraries needed to develop applications that require these. + %prep -%setup -q -%patch0 -%patch1 -%patch2 -%patch3 -%patch4 +%setup -q -n %{name}-%{version} + +# gdbm-%{version}.dif +%patch0 -p1 +# gdbm-protoize_dbm_headers.patch +%patch1 -p1 +# gdbm-prototype_static_functions.patch +%patch2 -p1 +# gdbm-fix_testprogs.patch +%patch3 -p1 +# gdbm-destdir.patch +%patch4 -p1 +# gdbm-stamp.patch +%patch5 -p1 %build -cp %{S:1001} . aclocal -%reconfigure --enable-libgdbm-compat --disable-static -make %{?_smp_mflags}; +autoreconf --force --install +export CFLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack" -%install -make install INSTALL_ROOT=$RPM_BUILD_ROOT -make install-compat INSTALL_ROOT=$RPM_BUILD_ROOT +%configure --disable-static +make %{?jobs:-j%jobs} -rm -rf %{buildroot}%{_libdir}/*.la +%install +rm -rf %{buildroot} +%make_install %remove_docs -%post -n libgdbm -p /sbin/ldconfig +%post -p /sbin/ldconfig -%postun -n libgdbm -p /sbin/ldconfig +%postun -p /sbin/ldconfig -%files -n libgdbm -%manifest %{name}.manifest +%files +%defattr(-,root,root,-) %doc COPYING -%_libdir/libgdbm.so.3 -%_libdir/libgdbm.so.3.0.0 -%_libdir/libgdbm_compat.so.3 -%_libdir/libgdbm_compat.so.3.0.0 +%{_libdir}/libgdbm.so.3 +%{_libdir}/libgdbm.so.3.0.0 %files devel -%manifest %{name}.manifest -%{_prefix}/include/dbm.h -%{_prefix}/include/gdbm.h -%{_prefix}/include/ndbm.h -%{_prefix}/%{_lib}/libgdbm.so -%{_prefix}/%{_lib}/libgdbm_compat.so +%defattr(-,root,root,-) +%{_libdir}/libgdbm.so +/usr/include/gdbm.h diff --git a/packaging/gdbm.yaml b/packaging/gdbm.yaml new file mode 100644 index 0000000..629a39f --- /dev/null +++ b/packaging/gdbm.yaml @@ -0,0 +1,25 @@ +Name: gdbm +Summary: GNU Database Routines +Version: 1.8.3 +Release: 1 +Group: System/Libraries +License: GPLv2+ and LGPLv2+ +URL: http://directory.fsf.org/GNU/gdbm.html +Sources: + - http://ftp.gnu.org/pub/gnu/gdbm/gdbm-%{version}.tar.bz2 +Patches: + - gdbm-%{version}.dif + - gdbm-protoize_dbm_headers.patch + - gdbm-prototype_static_functions.patch + - gdbm-fix_testprogs.patch + - gdbm-destdir.patch + - gdbm-stamp.patch +Description: A static and dynamic library for the GNU database routines. + +SubPackages: + - Name: devel + Summary: Include Files and Libraries mandatory for Development + Group: Development/Libraries + Description: | + This package contains all necessary include files and libraries needed + to develop applications that require these. -- 2.7.4