From 843e6ac4ed31d0d77b33d3c1f0848168597753c8 Mon Sep 17 00:00:00 2001 From: gnaygnil Date: Tue, 17 Mar 2020 16:27:57 +0800 Subject: [PATCH] ocaml-gettext: Remove camomile package --- README.en.md | 36 ----------------------------------- README.md | 39 -------------------------------------- ocaml-gettext.spec | 47 ++++++++++------------------------------------ 3 files changed, 10 insertions(+), 112 deletions(-) delete mode 100644 README.en.md delete mode 100644 README.md diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 32dd641..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# ocaml-gettext - -#### Description -{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index 69c660a..0000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# ocaml-gettext - -#### 介绍 -{**以下是码云平台说明，您可以替换此简介** -码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/ocaml-gettext.spec b/ocaml-gettext.spec index c0699e1..f0b9aab 100644 --- a/ocaml-gettext.spec +++ b/ocaml-gettext.spec @@ -2,19 +2,15 @@ Name: ocaml-gettext Version: 0.3.7 -Release: 7 +Release: 8 Summary: Internationalization library for OCaml License: LGPLv2+ with exceptions URL: https://github.com/gildor478/ocaml-gettext Source0: https://github.com/gildor478/ocaml-gettext/archive/%{version}.tar.gz Patch0001: ocaml-gettext-0.3.7-bytes-fix.patch -BuildRequires: ocaml >= 4.00.1 ocaml-findlib-devel >= 1.3.3-3 ocaml-ocamldoc -BuildRequires: ocaml-camlp4-devel ocaml-fileutils-devel >= 0.4.4-4 docbook-style-xsl -BuildRequires: libxslt libxml2 chrpath autoconf ocaml-ounit-devel -BuildRequires: ocaml-camomile-devel >= 0.8.6-3 ocaml-camomile-data autoconf, automake -Requires: ocaml-camomile-data -Provides: ocaml-gettext-camomile = %{version}-%{release} -Obsoletes: ocaml-gettext-camomile < %{version}-%{release} +BuildRequires: ocaml >= 4.00.1 ocaml-findlib-devel >= 1.3.3-3 ocaml-ocamldoc ocaml-camlp4-devel +BuildRequires: ocaml-fileutils-devel >= 0.4.4-4 docbook-style-xsl +BuildRequires: libxslt libxml2 chrpath autoconf automake %global __ocaml_requires_opts -i Asttypes -i Parsetree %global __ocaml_provides_opts -i Pr_gettext @@ -23,53 +19,35 @@ Obsoletes: ocaml-gettext-camomile < %{version}-%{release} The package is used to support for internationalization of Ocaml programs. %package devel -Summary: Development files for ocaml-gettext and camomile +Summary: Development files for ocaml-gettext Requires: ocaml-gettext = %{version}-%{release} Requires: ocaml-fileutils-devel >= 0.4.0 -Requires: ocaml-gettext-camomile = %{version}-%{release} -Provides: ocaml-gettext-camomile-devel = %{version}-%{release} -Obsoletes: ocaml-gettext-camomile-devel < %{version}-%{release} - %description devel -The ocaml-gettext-devel package contains development and libraries and files for -ocaml-gettext and camomile. - +The ocaml-gettext-devel package contains development and libraries and files for ocaml-gettext. %prep %autosetup -p1 autoreconf -i - %build unset MAKEFLAGS -CFLAGS="$RPM_OPT_FLAGS" ./configure --libdir=%{_libdir} --enable-test \ +CFLAGS="$RPM_OPT_FLAGS" ./configure --libdir=%{_libdir} --disable-camomile \ --with-docbook-stylesheet=/usr/share/sgml/docbook/xsl-stylesheets make all - -%check -cd test -../_build/bin/test -cd - - - %install export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml install -d $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs install -d $RPM_BUILD_ROOT%{_bindir} - ocamlfind install gettext _build/lib/gettext/* ocamlfind install gettext-stub _build/lib/gettext-stub/* -ocamlfind install gettext-camomile _build/lib/gettext-camomile/* cp _build/bin/ocaml-gettext $RPM_BUILD_ROOT%{_bindir}/ chmod 0755 $RPM_BUILD_ROOT%{_bindir}/ocaml-gettext cp _build/bin/ocaml-xgettext $RPM_BUILD_ROOT%{_bindir}/ chmod 0755 $RPM_BUILD_ROOT%{_bindir}/ocaml-xgettext - chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so - %files %doc COPYING %{_libdir}/ocaml/gettext/*.cma @@ -81,9 +59,6 @@ chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so %{_libdir}/ocaml/gettext-stub/*.cma %{_libdir}/ocaml/gettext-stub/*.cmi %{_libdir}/ocaml/gettext-stub/META -%{_libdir}/ocaml/gettext-camomile/*.cma -%{_libdir}/ocaml/gettext-camomile/*.cmi -%{_libdir}/ocaml/gettext-camomile/META %exclude %{_libdir}/ocaml/gettext-stub/*.o %files devel @@ -98,13 +73,11 @@ chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so %{_libdir}/ocaml/gettext/*.mli %{_libdir}/ocaml/gettext-stub/*.ml %{_bindir}/ocaml-gettext -%{_libdir}/ocaml/gettext-camomile/*.a -%{_libdir}/ocaml/gettext-camomile/*.cmxa -%{_libdir}/ocaml/gettext-camomile/*.cmx -%{_libdir}/ocaml/gettext-camomile/*.mli %{_bindir}/ocaml-xgettext - %changelog +* Tue Mar 17 2020 Ling Yang - 0.3.7-8 +- Remove camomile package + * Thu Feb 27 2020 zhujunhao - 0.3.7-7 - Package init