Accepting request 138020 from home:Mailaender:branches:Education
update to 1.12.1 put libmaa into seperate package OBS-URL: https://build.opensuse.org/request/show/138020 OBS-URL: https://build.opensuse.org/package/show/Education/dictd?expand=0&rev=3
This commit is contained in:
andrea florio
Git OBS Bridge
parent
96ca9aad08
commit
61738d82f1
@ -1,34 +0,0 @@
|
||||
Index: Makefile.in
|
||||
===================================================================
|
||||
--- Makefile.in.orig
|
||||
+++ Makefile.in
|
||||
@@ -33,8 +33,9 @@ VPATH= @srcdir@:.
|
||||
prefix= @prefix@
|
||||
subdirs= @allsubdirs@ # doc -- use rfc2229 instead
|
||||
exec_prefix= @exec_prefix@
|
||||
-man1_prefix= @mandir@/man1
|
||||
-man8_prefix= @mandir@/man8
|
||||
+mandir= @mandir@
|
||||
+man1_prefix= $(mandir)/man1
|
||||
+man8_prefix= $(mandir)/man8
|
||||
bindir= @bindir@
|
||||
libdir= @libdir@
|
||||
libexecdir= @libexecdir@
|
||||
Index: md5.h
|
||||
===================================================================
|
||||
--- md5.h.orig
|
||||
+++ md5.h
|
||||
@@ -1,11 +1,8 @@
|
||||
#ifndef MD5_H
|
||||
#define MD5_H
|
||||
|
||||
-#ifdef __alpha
|
||||
-typedef unsigned int uint32;
|
||||
-#else
|
||||
-typedef unsigned long uint32;
|
||||
-#endif
|
||||
+#include <stdint.h>
|
||||
+typedef uint32_t uint32;
|
||||
|
||||
struct MD5Context {
|
||||
uint32 buf[4];
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1686e5c1670b595a419a075355d17fd7fb1652c1efe05b3991b7eb07d0f6bdf4
|
||||
size 332700
|
||||
3
dictd-1.12.1.tar.gz
Normal file
3
dictd-1.12.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a237f6ecdc854ab10de5145ed42eaa2d9b6d51ffdc495f7daee59b05cc363656
|
||||
size 423870
|
||||
@ -1,3 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 12 23:56:35 UTC 2012 - mailaender@opensuse.org
|
||||
|
||||
- put libmma in a separate package
|
||||
- update dictd to 1.12.1
|
||||
+ Fix for Debian bug #677868 reported by Stepan Golosunov.
|
||||
+ Fixes for mistypes found by A. Costa. Thanks!
|
||||
+ Fix for sf.net bug #3390567 reported by Ivo Danihelka.
|
||||
+ Fix for sf.net bug #3398178
|
||||
+ Fix for option -c. Now it works correctly.
|
||||
+ Fix incorrect keyword for virtual database.
|
||||
+ fix in colorit: option -c now works correctly
|
||||
+ Check return value of fwrite, fflush and fclose functions. This fixes sf bug #3390567
|
||||
+ Fix for Debian bug #677868 reported by Stepan Golosunov.
|
||||
+ dictd.8.in: fixes for mistypes found by A. Costa. Thanks!
|
||||
+ INSTALL: Fix for sf.net bug #3398178
|
||||
+ fix in dictd_virtual.conf: incorrect keyword for virtual database.
|
||||
+ Makefile.in: Add -c to ${INSTALL} envocations
|
||||
+ Makefile.in: fix for installing from obj directory
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 15 21:35:28 UTC 2012 - lars@linux-schulserver.de
|
||||
|
||||
|
||||
88
dictd.spec
88
dictd.spec
@ -2,29 +2,26 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
%define maa_ver 1.3.1
|
||||
|
||||
Name: dictd
|
||||
Version: 1.12.0
|
||||
Version: 1.12.1
|
||||
Release: 1
|
||||
License: GPLv2+
|
||||
License: GPL-2.0+
|
||||
Summary: Electronic Online Dictionaries
|
||||
Url: http://www.dict.org
|
||||
Group: Productivity/Office/Dictionary
|
||||
Source0: %{name}-%{version}.tar.bz2
|
||||
Source1: libmaa-%{maa_ver}.tar.bz2
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Source2: dictd.init
|
||||
Source3: colorit.conf
|
||||
Patch0: %{name}-%{version}.patch
|
||||
Patch1: libmaa-%{maa_ver}.patch
|
||||
BuildRequires: libmaa-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: bison
|
||||
BuildRequires: flex
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: gcc
|
||||
BuildRequires: libtool
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if 0%{?suse_version}
|
||||
Requires(pre): %insserv_prereq %fillup_prereq
|
||||
|
||||
%define separate_maa 0
|
||||
%endif
|
||||
|
||||
%description
|
||||
This package contains two programs. With dict, you have access to
|
||||
@ -41,64 +38,18 @@ Requires: %{name} = %{version}
|
||||
%description devel
|
||||
Development files for dictd (header files).
|
||||
|
||||
%if %{separate_maa}
|
||||
%package -n libmaa1
|
||||
Version: %{maa_ver}
|
||||
Summary: Library providing many low-level data structures
|
||||
Group: System/Libraries/C and C++
|
||||
|
||||
%description -n libmaa1
|
||||
The libmaa library provides many low-level data structures which are
|
||||
helpful for writing compilers, including hash tables, sets, lists,
|
||||
debugging support, and memory management. Although libmaa was designed
|
||||
and implemented as a foundation for the kheperalong, the data structures
|
||||
are generally applicable to a wide range of programming problems.
|
||||
|
||||
The memory management routines are especially helpful for improving the
|
||||
performance of memory-intensive applications.
|
||||
|
||||
%package -n libmaa-devel
|
||||
Version: %{maa_ver}
|
||||
Summary: Development files for libmaa
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libmaa1 = %{maa_ver}
|
||||
|
||||
%description -n libmaa-devel
|
||||
Development files for libmaa
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -q -a 1
|
||||
%patch0 -p0
|
||||
cd libmaa-%{maa_ver}
|
||||
%patch1 -p0
|
||||
%setup -q
|
||||
|
||||
%build
|
||||
cd libmaa-%{maa_ver}
|
||||
%configure \
|
||||
--enable-dictorg
|
||||
make %{?_smp_mflags}
|
||||
cd ..
|
||||
export CFLAGS="%{optflags} -Ilibmaa-%{maa_ver}"
|
||||
export LDFLAGS="$LDFLAGS -L./libmaa-%{maa_ver}/.libs"
|
||||
%configure
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
%make_install
|
||||
install -D -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/init.d/dictd
|
||||
install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/colorit.conf
|
||||
ln -sf /etc/init.d/dictd %{buildroot}%{_sbindir}/rcdictd
|
||||
%if %{separate_maa}
|
||||
cd libmaa-%{maa_ver}
|
||||
%make_install
|
||||
rm -f %{buildroot}%{_libdir}/*.la
|
||||
rm -f %{buildroot}%{_libdir}/*.a
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%post
|
||||
%fillup_and_insserv dictd
|
||||
@ -114,12 +65,6 @@ chmod 644 %{_localstatedir}/log/dictd
|
||||
%insserv_cleanup
|
||||
rm -rf %{_localstatedir}/log/dictd
|
||||
|
||||
%if %{separate_maa}
|
||||
%post -n libmaa1 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libmaa1 -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc ANNOUNCE COPYING ChangeLog NEWS README TODO example*
|
||||
@ -135,15 +80,4 @@ rm -rf %{_localstatedir}/log/dictd
|
||||
%defattr(-,root,root)
|
||||
%{_includedir}/dict*
|
||||
|
||||
%if %{separate_maa}
|
||||
%files -n libmaa1
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/*.so.*
|
||||
|
||||
%files -n libmaa-devel
|
||||
%defattr(-,root,root)
|
||||
%{_includedir}/maa*
|
||||
%{_libdir}/*.so
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
%changelog
|
||||
@ -1,8 +0,0 @@
|
||||
--- doc/extract.pl
|
||||
+++ doc/extract.pl
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/perl
|
||||
+#!/usr/bin/perl
|
||||
# This file is -*- perl -*- source.
|
||||
# Created: Wed Jan 4 13:04:37 1995 by faith@cs.unc.edu
|
||||
# Revised: Mon Dec 9 15:22:26 1996 by faith@cs.unc.edu
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fadc9bb8093a8fa2e8f5b4e5bed39ae465e0ead385fd84ba88f67f9e29586798
|
||||
size 253164
|
||||
Loading…
Reference in New Issue
Block a user