summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroshi Sumita <hsumita@chromium.org>2012-07-12 10:48:55 +0900
committerHiroshi Sumita <hsumita@chromium.org>2012-07-12 10:48:55 +0900
commit35ebd6fe0cf7eb0d6d7ff00b40ae605539ad6923 (patch)
tree5d561592cce4e2e893d900ec4c130236c92eb208
parent65444f972920ca979493397bec1717ad9ac04a93 (diff)
downloadpyzy-35ebd6fe0cf7eb0d6d7ff00b40ae605539ad6923.tar.gz
Fixes errors on "make distclean" and "make rpm".
BUG="make distclean" and "make rpm" are broken. TEST=make, make distclean and make rpm. Review URL: https://codereview.appspot.com/6345085
-rw-r--r--data/db/open-phrase/Makefile.am4
-rw-r--r--docs/Makefile.am5
-rw-r--r--pyzy.spec.in4
3 files changed, 7 insertions, 6 deletions
diff --git a/data/db/open-phrase/Makefile.am b/data/db/open-phrase/Makefile.am
index 94d8107..6cf2ed3 100644
--- a/data/db/open-phrase/Makefile.am
+++ b/data/db/open-phrase/Makefile.am
@@ -26,8 +26,8 @@ main_db_DATA = \
$(NULL)
main_dbdir = $(pkgdatadir)/db
-DBVER = 1.2.99
-DBTAR = pinyin-database-$(DBVER).tar.bz2
+DBVER = 1.0.0
+DBTAR = pyzy-database-$(DBVER).tar.bz2
$(DBTAR):
$(AM_V_GEN) \
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 39e0e86..6803226 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -30,5 +30,8 @@ CLEANFILES = doxyfile.stamp
all-local: doxyfile.stamp
clean-local:
- rm -rf $(top_srcdir)/docs/html
+ rm -rf html
+
+distclean-local: clean-local
+
endif
diff --git a/pyzy.spec.in b/pyzy.spec.in
index 744287c..344e017 100644
--- a/pyzy.spec.in
+++ b/pyzy.spec.in
@@ -6,7 +6,7 @@ License: LGPL2.1
Group: System Environment/Libraries
URL: http://code.google.com/p/pyzy
Source0: http://pyzy.googlecode.com/files/%{name}-%{version}.tar.gz
-Source1: pinyin-database-1.2.99.tar.bz2
+Source1: http://pyzy.googlecode.com/files/pyzy-database-1.0.0.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -15,7 +15,6 @@ BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: sqlite-devel
BuildRequires: libuuid-devel
-BuildRequires: gtest-devel
# Requires(post): sqlite
@@ -55,7 +54,6 @@ The phrase database for pyzy from android project.
%prep
%setup -q
-cp %{SOURCE1} data/db/open-phrase
%build
%configure --disable-static --enable-db-open-phrase