rpms/caribou/devel caribou.spec,1.2,1.3

Matthias Clasen mclasen at fedoraproject.org
Sat May 29 15:45:31 UTC 2010


Author: mclasen

Update of /cvs/pkgs/rpms/caribou/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16051

Modified Files:
	caribou.spec 
Log Message:
0.1.2



Index: caribou.spec
===================================================================
RCS file: /cvs/pkgs/rpms/caribou/devel/caribou.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- caribou.spec	28 May 2010 15:10:00 -0000	1.2
+++ caribou.spec	29 May 2010 15:45:31 -0000	1.3
@@ -15,6 +15,11 @@ Source0:        http://ftp.gnome.org/pub
 BuildArch:      noarch
 
 BuildRequires:  python-devel
+BuildRequires:  pygtk2-devel
+BuildRequires:  pyclutter-devel
+BuildRequires:  at-spi-python
+BuildRequires:  python-virtkey
+
 Requires:       pygtk2
 Requires:       at-spi-python
 Requires:       pyclutter
@@ -29,26 +34,20 @@ a simplified in-place on-screen keyboard
 
 
 %build
-# nothing to do here because caribou does not use autotools yet
-
+%configure
+make
 
 %install
-# manually install until caribou starts using autotools
-mkdir -p $RPM_BUILD_ROOT%{python_sitelib}
-cp -r src/caribou $RPM_BUILD_ROOT%{python_sitelib}
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-cp src/caribou.py $RPM_BUILD_ROOT%{_bindir}/caribou
-
-# correct the paths
-sed -i -e "s|\(caribou/keyboards\)|%{python_sitelib}/\1|" $RPM_BUILD_ROOT%{python_sitelib}/caribou/keyboards/__init__.py
-sed -i -e "s|\(caribou/caribou-prefs.ui\)|%{python_sitelib}/\1|" $RPM_BUILD_ROOT%{python_sitelib}/caribou/keyboard.py
+make install DESTDIR=$RPM_BUILD_ROOT
 
+%find_lang caribou
 
-%files
+%files -f caribou.lang
 %defattr(-,root,root,-)
 %doc COPYING README
 %{python_sitelib}/caribou
 %{_bindir}/caribou
+%{_datadir}/caribou
 
 
 %changelog



More information about the scm-commits mailing list