Browse Source

correct Requires

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10708 ec354946-7b23-47d6-9f5a-488ba84defc7
ara_t 8 years ago
parent
commit
dfac95db36
1 changed files with 16 additions and 6 deletions
  1. 16 6
      o/opensource-cobol/opensource-cobol-vl.spec

+ 16 - 6
o/opensource-cobol/opensource-cobol-vl.spec

@@ -1,6 +1,6 @@
 %define pkg_name    opensource-cobol
 %define pkg_version 1.5.0J
-%define pkg_release 1%{?_dist_release}
+%define pkg_release 2%{?_dist_release}
 
 Summary: An open-source COBOL compiler
 Name:    %{pkg_name}
@@ -31,10 +31,11 @@ BuildRequires: texlive-collection-plainextra
 BuildRequires: texlive-collection-fontsrecommended
 %endif
 
+Requires: ncurses-devel
 %if %{?_dist_release} == "vl6"
-Requires: db4
+Requires: db4-devel
 %else
-Requires: libdb
+Requires: libdb-devel
 %endif
 
 Vendor: Project Vine
@@ -68,6 +69,9 @@ OpenCOBOLに日本特有のビジネス環境に即したカスタマイズ、
 %setup -q -n %{name}-%{version}-utf8
 
 %build
+%if %{?_dist_release} >= "vl7"
+export CFLAGS="%{optflags} -std=gnu89"
+%endif
 %{configure} \
  --enable-utf8 \
  --disable-static
@@ -87,13 +91,14 @@ OpenCOBOLに日本特有のビジネス環境に即したカスタマイズ、
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %post
-/sbin/install-info %{_infodir}/open-cobol.info.gz %{_infodir}/dir 2>/dev/null
+%{_syssbindir}/install-info %{_infodir}/open-cobol.info.gz \
+ %{_infodir}/dir 2>/dev/null
 %{_syssbindir}/ldconfig
 
 %preun
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/open-cobol.info.gz \
-                       %{_infodir}/dir 2>/dev/null
+    %{_syssbindir}/install-info --delete %{_infodir}/open-cobol.info.gz \
+     %{_infodir}/dir 2>/dev/null
 fi
 
 %postun -p %{_syssbindir}/ldconfig
@@ -114,6 +119,11 @@ fi
 
 
 %changelog
+* Fri Jul 29 2016 Toshiaki Ara <ara_t@384.jp> 1.5.0J-2
+- change Requires: ncurses to ncurses-devel
+- change Requires: db4/libdb to db4-devel/libdb-devel
+- add export CFLAGS="%{optflags} -std=gnu89" for VineSeed (gcc-5)
+
 * Sun Jun 19 2016 Toshiaki Ara <ara_t@384.jp> 1.5.0J-1
 - update to 1.5.0J
 - delete BuildRequires: texlive-collection-lang*