Browse Source

2014-12-06 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* gnokii, libpqxx: updated
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9138 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 8 years ago
parent
commit
8b6b7b2a43
2 changed files with 28 additions and 17 deletions
  1. 19 10
      g/gnokii/gnokii-vl.spec
  2. 9 7
      lib/libp/libpqxx/libpqxx-vl.spec

+ 19 - 10
g/gnokii/gnokii-vl.spec

@@ -1,10 +1,10 @@
 # TODO: merge patches upstream where applicable
 
 Name:           gnokii
-Version:        0.6.30
+Version:        0.6.31
 Release:        1%{?_dist_release}
 Summary:        Linux/Unix tool suite for various mobile phones
-Summary(ja): Linux/Unix tool suite for various mobile phones
+Summary(ja):    様々な携帯電話向けの Linux/Unix ツール集
 
 Group:          Applications/Communications
 License:        GPLv2+
@@ -36,19 +36,16 @@ BuildRequires:	bluez-libs-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gtk2-devel
 BuildRequires:	libusb-devel
-BuildRequires:	mysql-devel
-BuildRequires:	postgresql-devel
+BuildRequires:	libmysqlclient-devel
+BuildRequires:	libpq-devel
 BuildRequires:	readline-devel
+BuildRequires:	pcsc-lite-devel
 BuildRequires:	sqlite3-devel
 BuildRequires:	zlib-devel
 
 BuildRequires:	libical-devel >= 0.24
-
-# VineSeed
 BuildRequires:	libXt-devel
 BuildRequires:	libXpm-devel
-## VineLinux-4.x
-## BuildRequires: XOrg, XOrg-libs, XOrg-sdk 
 
 BuildRequires:	perl(XML::Parser)
 Requires(pre):  %{_sbindir}/groupadd
@@ -117,19 +114,23 @@ Requires:       pkgconfig
 #----------------------------------------------------------------------------
 %prep
 %setup -q
-%patch1 -p0
+%patch1 -p0 
 install -pm 644 %{SOURCE5} smsd2mail.sh
 install -pm 644 %{SOURCE6} README.smsd2mail
 
 %build
 %configure --enable-security --disable-rpath --disable-static \
-		--enable-libical
+		--enable-libical --with-x
 make %{?_smp_mflags}
 
+# xgnokii isn't built by the above make operation (Is it a bug?)
+make %{?_smp_mflags} -C xgnokii
+
 
 #----------------------------------------------------------------------------
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT -C xgnokii
 
 # Rename smsd to gnokii-smsd
 mv $RPM_BUILD_ROOT%{_bindir}/{,gnokii-}smsd
@@ -163,6 +164,7 @@ install -Dpm 644 %{SOURCE4} \
 cp -a Docs/sample/gnokiirc $RPM_BUILD_ROOT%{_sysconfdir}/
 
 # Install the docs
+rm -rf temporary-gnokii-docs
 mkdir -p temporary-gnokii-docs/
 mv $RPM_BUILD_ROOT%{_datadir}/doc/gnokii/ temporary-gnokii-docs/
 
@@ -257,6 +259,13 @@ fi
 #
 #----------------------------------------------------------------------------
 %changelog
+* Mon Dec  1 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.6.31-1
+- new upstream release
+- updated Patch1
+- built with libmysqlclient 10.0.15 and libpq 9.3.4
+- updated BR for libmysqlclient-devel and libpq-devel
+- added BR: pcsc-lite-devel
+
 * Sun Aug 21 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.6.30-1
 - new upstream release
 - remove Patch0

+ 9 - 7
lib/libp/libpqxx/libpqxx-vl.spec

@@ -1,20 +1,19 @@
 Summary: A C++ API to the PostgreSQL database management system.
 Summary(ja): PostgreSQL の C++ API
 Name: libpqxx
-Version: 3.1
-Release: 2%{?_dist_release}
+Version: 4.0.1
+Release: 1%{?_dist_release}
 
 Group: System Environment/Libraries
 License: BSD
 URL: http://pqxx.org/
 
 Source: ftp://pqxx.org/software/libpqxx/%{name}-%{version}.tar.gz
-Patch0: libpqxx-2.6.9-glibc-headers.patch
 Patch3: libpqxx-2.6.8-multilib.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: postgresql-devel
-Requires: postgresql-libs
+BuildRequires: libpq-devel
+#Requires: postgresql-libs
 
 %description
 What libpqxx brings you is effective use of templates to reduce the 
@@ -28,7 +27,7 @@ with most other database interfaces.
 
 %package devel
 Summary: Libraries, includes, etc. to develop PostgreSQL applications in C++.
-Summary(ja): C++ で PostgreSQL アプリケーションを開発ためのライブラリ/ヘッダファイル等
+Summary(ja): C++ で PostgreSQL アプリケーションを開発するためのファイル集
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
@@ -38,7 +37,6 @@ in C++.
 
 %prep
 %setup -q
-#patch0 -p0 -b .gibc-headers
 %patch3 -p1 -b .multilib
 
 # fix spurious permissions
@@ -74,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Dec  1 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.0.1-1
+- new upstream release
+- rebuilt with libpq 9.3.4
+
 * Tue Apr 12 2011 Shu KONNO <owa@bg.wakwak.com> 3.1-2
 - rebuilt with postgresql-9.0.3