SPECS (DEVEL): gedit2.spec - fixed partially mess called 'upgrade ...

freetz freetz at pld-linux.org
Sat Jan 7 01:22:46 CET 2006


Author: freetz                       Date: Sat Jan  7 00:22:46 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- fixed partially mess called 'upgrade by patrys'

---- Files affected:
SPECS:
   gedit2.spec (1.85.2.2 -> 1.85.2.3) 

---- Diffs:

================================================================
Index: SPECS/gedit2.spec
diff -u SPECS/gedit2.spec:1.85.2.2 SPECS/gedit2.spec:1.85.2.3
--- SPECS/gedit2.spec:1.85.2.2	Wed Jan  4 23:26:14 2006
+++ SPECS/gedit2.spec	Sat Jan  7 01:22:40 2006
@@ -78,19 +78,19 @@
 %setup -q -n gedit-%{version}
 %patch0 -p1
 %patch1 -p1
+sed -i 's/codegen.py/codegen.pyc/' configure.ac
 
 %build
-cat m4/*.m4 > acinclude.m4
-sed -i 's/codegen.py/codegen.pyc/' configure.ac
 %{__gnome_doc_common}
 %{__libtoolize}
 %{__intltoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
 %configure \
 	--disable-schemas-install \
-	--enable-python
+	--enable-python \
+	--with-omf-dir=%{_omf_dest_dir}/%{name}
 %{__make}
 
 %install
@@ -98,15 +98,13 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	omf_dest_dir=%{_omf_dest_dir}/%{name} \
 	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
 # Remove obsoleted *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins/*.la
-
 rm -r $RPM_BUILD_ROOT%{_datadir}/{application-registry,mime-info}
-
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+rm -f $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins/*.py
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -135,7 +133,7 @@
 %dir %{_libdir}/gedit-2
 %dir %{_libdir}/gedit-2/plugins
 %attr(755,root,root) %{_libdir}/gedit-2/plugins/*.so*
-%attr(755,root,root) %{_libdir}/gedit-2/plugins/*.py
+%attr(755,root,root) %{_libdir}/gedit-2/plugins/*.py[co]
 %{_libdir}/gedit-2/plugins/*.gedit-plugin
 %{_datadir}/gedit-2
 %{_desktopdir}/*
@@ -154,6 +152,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.85.2.3  2006/01/07 00:22:40  freetz
+- fixed partially mess called 'upgrade by patrys'
+
 Revision 1.85.2.2  2006/01/04 22:26:14  patrys
 - enabled support for python plugins
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gedit2.spec?r1=1.85.2.2&r2=1.85.2.3&f=u



More information about the pld-cvs-commit mailing list