Changeset 814 for spec/trunk/SPECS/gettext.spec

Timestamp:

Jun 28, 2016, 11:44:26 AM (9 years ago)

Author:

Silvan Scherrer

Message:

spec: gettext updated to version 0.19.8.1

File:

• spec/trunk/SPECS/gettext.spec (modified) (20 diffs)

spec/trunk/SPECS/gettext.spec

@@ -1 @@
-#define svn_url     F:/rd/ports/gettext/trunk
+#define svn_url     e:/trees/gettext/trunk
 %define svn_url     http://svn.netlabs.org/repos/ports/gettext/trunk
-%define svn_rev     1005
-
-%bcond_with jar
-%bcond_with java
-%bcond_without check
-%bcond_without git
+%define svn_rev     1622
+
+%define with_jar 0
+%define with_java 0
+%define with_check 0
+%define with_git 0
+%define with_emacs 0
+
+%global archiveversion 0.19.8
 
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
-Version: 0.18.3.2
-Release: 2%{?dist}
+Version: 0.19.8.1
+Release: 1%{?dist}
 License: GPLv3+ and LGPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/gettext/
+Vendor: bww bitwise works GmbH
 Source: %{name}-%{version}%{?svn_rev:-r%{svn_rev}}.zip
 Source1: gettext-legacy-os2.zip
@@ -21 +25 @@
 BuildRequires: automake
 BuildRequires: libtool, bison
-%if %{with java}
+%if %{with_java}
 # libintl.jar requires gcj >= 4.3 to build
-#BuildRequires: gcc-java, libgcj
+BuildRequires: gcc-java, libgcj
 # For javadoc
-#BuildRequires: java-1.6.0-openjdk-devel
-%if %{with jar}
-#BuildRequires: %{_bindir}/fastjar
+BuildRequires: java-1.6.0-openjdk-devel
+%if %{with_jar}
+BuildRequires: %{_bindir}/fastjar
 # require zip and unzip for brp-java-repack-jars
 BuildRequires: zip, unzip
 %endif
 %endif
-# need expat for xgettext on glade
-Buildrequires: expat-devel
 # for po-mode.el
-#BuildRequires: emacs
-%if %{with git}
+%if %{with_emacs}
+BuildRequires: emacs
+%endif
+%if %{with_git}
 # for autopoint:
-#BuildRequires: git
+BuildRequires: git
 %endif
 #BuildRequires: chrpath
 
-Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
-Requires: gettext-libs = %{version}-%{release}
+# following suggested by DEPENDENCIES:
+BuildRequires: ncurses-devel
+BuildRequires: libxml2-devel
+BuildRequires: glib2-devel
+#BuildRequires: libcroco-devel
+#BuildRequires: libunistring-devel
+#Requires(post): info
+#Requires(preun): info
+Requires: %{name}-libs = %{version}-%{release}
 
 %description
@@ -59 +69 @@
 
 
+%package common-devel
+Summary: Common development files for %{name}
+Group: Development/Tools
+# autopoint archive
+License: GPLv3+
+BuildArch: noarch
+
+%description common-devel
+This package contains common architecture independent gettext development files.
+
+
 %package devel
 Summary: Development files for %{name}
@@ -66 +87 @@
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
+#Requires(post): info
+#Requires(preun): info
+%if %{with_git}
 # for autopoint
-#Requires: git
+Requires: git
+%endif
 Obsoletes: gettext-autopoint < 0.18.3.2-1
 Provides: gettext-autopoint = %{version}-%{release}
-
 
 %description devel
@@ -82 +106 @@
 Summary: Libraries for %{name}
 Group: System Environment/Libraries
-License: LGPLv2+
+# libasprintf is LGPLv2+
+# libgettextpo is GPLv3+
+License: LGPLv2+ and GPLv3+
 
 %description libs
@@ -88 +114 @@
 
 
-#%package -n emacs-%{name}
-#Summary: Support for editing po files within GNU Emacs
-#Group: Applications/Editors
-#BuildArch: noarch
+%if %{with_emacs}
+%package -n emacs-%{name}
+Summary: Support for editing po files within GNU Emacs
+Group: Applications/Editors
+BuildArch: noarch
 # help users find po-mode.el
-#Provides: emacs-po-mode
-#Requires: emacs(bin) >= %{_emacs_version}
-
-#%description -n emacs-%{name}
-#This package provides a major mode for editing po files within GNU Emacs.
-
-
-#%package -n emacs-%{name}-el
-#Summary: Elisp source files for editing po files within GNU Emacs
-#Group: Applications/Editors
-#BuildArch: noarch
-#Requires: emacs-%{name} = %{version}-%{release}
-
-#%description -n emacs-%{name}-el
-#This package contains the Elisp source files for editing po files within GNU
-#Emacs.
+Provides: emacs-po-mode
+Requires: emacs(bin) >= %{_emacs_version}
+Provides: emacs-%{name}-el = %{version}-%{release}
+Obsoletes: emacs-%{name}-el < %{version}-%{release}
+
+%description -n emacs-%{name}
+This package provides a major mode for editing po files within GNU Emacs.
+%endif
 
 
@@ -125 +144 @@
 %setup -q
 %else
-%setup -n "%{name}-%{version}" -Tc -a 1
-echo %{svn_rev}
+%setup -n "%{name}-%{version}" -Tc
 svn export %{?svn_rev:-r %{svn_rev}} %{svn_url} . --force
 rm -f "%{_sourcedir}/%{name}-%{version}%{?svn_rev:-r%{svn_rev}}.zip"
@@ -132 +150 @@
 %endif
 
+
 %build
-%if %{with java}
+%if %{with_java}
 export JAVAC=gcj
-%if %{with jar}
+%if %{with_jar}
 export JAR=fastjar
 %endif
@@ -143 +162 @@
 export LIBS="-lurpo -lmmap" ; \
 
-autogen.sh --skip-gnulib --quick
+autogen.sh --skip-gnulib
 
 %configure \
@@ -149 +168 @@
     --with-libxml2-prefix=/@unixroot/usr/include/libxml2 \
     --disable-csharp \
-    --disable-java --disable-native-java\
-    --disable-git \
     --disable-rpath \
-    --enable-shared --disable-static
+    --enable-shared --disable-static \
+%if %{with_java}
+    --enable-java \
+%else
+    --disable-java --disable-native-java \
+%endif
+%if !%{with_git}
+    --disable-git
+%endif
 
 cd gettext-tools/gnulib-lib
@@ -163 +188 @@
 %install
 rm -rf %{buildroot}
-#INSTALL="%{__install} -p"
 make install DESTDIR=${RPM_BUILD_ROOT} \
     lispdir=%{_datadir}/emacs/site-lisp/gettext \
     aclocaldir=%{_datadir}/aclocal EXAMPLESFILES=""
 
-#rm -f ${RPM_BUILD_ROOT}%{_datadir}/gettext/archive.git.tar.gz
 
 # OS/2 specific files
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/charset.alias
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/locale/locale.alias
 cp -p kintl.dll %{buildroot}%{_libdir}
-
-
-# move gettext to /bin
-#mkdir -p ${RPM_BUILD_ROOT}/bin
-#mv ${RPM_BUILD_ROOT}%{_bindir}/gettext ${RPM_BUILD_ROOT}/bin
-#ln -s ../../bin/gettext ${RPM_BUILD_ROOT}%{_bindir}/gettext
-
-#install -pm 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/msghack
 
 
@@ -204 +220 @@
 ## note libintl.jar does not build with gcj < 4.3
 ## since it would not be fully portable
-%if %{with jar}
+%if %{with_jar}
 ### this is no longer needed since examples not packaged
 ## set timestamp of examples ChangeLog timestamp for brp-java-repack-jars
@@ -217 +233 @@
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}/gettext.jar
 
+# own this directory for third-party *.its files
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/its
+
 # remove unpackaged files from the buildroot
 rm ${RPM_BUILD_ROOT}%{_libdir}/lib*.la
@@ -222 +241 @@
 # move po-mode initialization elisp file to the right place, and remove byte
 # compiled file
-#install -d ${RPM_BUILD_ROOT}%{_emacs_sitestartdir}
-#mv ${RPM_BUILD_ROOT}%{_emacs_sitelispdir}/%{name}/start-po.el ${RPM_BUILD_ROOT}%{_emacs_sitestartdir}
-#rm ${RPM_BUILD_ROOT}%{_emacs_sitelispdir}/%{name}/start-po.elc
+%if %{with_emacs}
+install -d ${RPM_BUILD_ROOT}%{_emacs_sitestartdir}
+mv ${RPM_BUILD_ROOT}%{_emacs_sitelispdir}/%{name}/start-po.el ${RPM_BUILD_ROOT}%{_emacs_sitestartdir}
+rm ${RPM_BUILD_ROOT}%{_emacs_sitelispdir}/%{name}/start-po.elc
+%endif
 
 %find_lang %{name}-runtime
@@ -242 +263 @@
 
 
-#%if %{with check}
-#%check
-## this takes quite a lot of time to run
-#make check
-#%endif
-
-
-#%post
+%if %{with_check}
+%check
+# this takes quite a lot of time to run
+
+# override LIBUNISTRING to prevent reordering of lib objects
+make check LIBUNISTRING=-lunistring
+%endif
+
+
+%post
 #/sbin/ldconfig
 #/sbin/install-info %{_infodir}/gettext.info.gz %{_infodir}/dir || :
 
 
-#%preun
-#if [ "$1" = 0 ]; then
+%preun
+if [ "$1" = 0 ]; then
 #  /sbin/install-info --delete %{_infodir}/gettext.info.gz %{_infodir}/dir || :
-#fi
+fi
 
 
@@ -263 +286 @@
 
 
-#%post devel
+%post devel
 #/sbin/ldconfig
 #/sbin/install-info %{_infodir}/autosprintf.info %{_infodir}/dir || :
 
 
-#%preun devel
-#if [ "$1" = 0 ]; then
+%preun devel
+if [ "$1" = 0 ]; then
 #  /sbin/install-info --delete %{_infodir}/autosprintf.info %{_infodir}/dir || :
-#fi
+fi
 
 
@@ -286 +309 @@
 %doc gettext-runtime/man/*.1.html
 %doc gettext-runtime/intl/COPYING*
-#/bin/*
+%{_bindir}/*
 %exclude %{_bindir}/autopoint
-%{_bindir}/*
+%exclude %{_bindir}/gettextize
 %{_infodir}/gettext*
 %exclude %{_mandir}/man1/autopoint.1*
 %{_mandir}/man1/*
 %{_libdir}/%{name}
-%if %{with java}
+%if %{with_java}
 %exclude %{_libdir}/%{name}/gnu.gettext.*
 %endif
 %dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/its
 %{_datadir}/%{name}/ABOUT-NLS
-%{_datadir}/%{name}/intl
 %{_datadir}/%{name}/po
 %{_datadir}/%{name}/styles
-%{_datadir}/locale/locale.alias
+%dir %{_datadir}/%{name}-%{archiveversion}
+%{_datadir}/%{name}-%{archiveversion}/its
+
+%files common-devel
+%{_datadir}/%{name}/archive.*.tar.xz
+
 
 %files devel
 %defattr(-,root,root,-)
-#%doc gettext-runtime/man/*.3.html ChangeLog
+%doc gettext-runtime/man/*.3.html ChangeLog
 %{_bindir}/autopoint
-%{_datadir}/%{name}/archive.*.tar.xz
+%{_bindir}/gettextize
 %{_datadir}/%{name}/projects/
 %{_datadir}/%{name}/config.rpath
@@ -318 +346 @@
 %{_mandir}/man1/autopoint.1*
 %{_mandir}/man3/*
+%{_datadir}/%{name}/intl
 %{_datadir}/%{name}/javaversion.class
-#%doc gettext-runtime/intl-java/javadoc*
-%if %{with java}
+%if %{with_java}
+%doc gettext-runtime/intl-java/javadoc*
 %{_libdir}/%{name}/gnu.gettext.*
 %endif
@@ -328 +357 @@
 %{_libdir}/*.dll
 %exclude %{_libdir}/kintl.dll
-%if %{with jar}
+%if %{with_jar}
 %{_datadir}/%{name}/libintl.jar
 %endif
 
-#%files -n emacs-%{name}
-#%defattr(-,root,root,-)
-#%dir %{_emacs_sitelispdir}/%{name}
-#%{_emacs_sitelispdir}/%{name}/*.elc
-#%{_emacs_sitestartdir}/*.el
-
-#%files -n emacs-%{name}-el
-#%defattr(-,root,root,-)
-#%{_emacs_sitelispdir}/%{name}/*.el
+%if %{with_emacs}
+%files -n emacs-%{name}
+%defattr(-,root,root,-)
+%dir %{_emacs_sitelispdir}/%{name}
+%{_emacs_sitelispdir}/%{name}/*.elc
+%{_emacs_sitelispdir}/%{name}/*.el
+%{_emacs_sitestartdir}/*.el
+%endif
 
 %files legacy
@@ -347 +375 @@
 
 %changelog
+* Mon Jun 27 2016 yd <silvan.scherrer@aroa.ch> 0.19.8.1-1
+- updated to version 0.19.8.1
+
 * Sat Jun 18 2016 yd <yd@os2power.com> 0.18.3.2-2
 - rebuild for glib2 2.33.