Author: megabajt                     Date: Sun Nov 11 11:50:26 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- [EMAIL PROTECTED] -> [EMAIL PROTECTED]
- use --with-omf
- release 2

---- Files affected:
SPECS:
   meld.spec (1.52 -> 1.53) 

---- Diffs:

================================================================
Index: SPECS/meld.spec
diff -u SPECS/meld.spec:1.52 SPECS/meld.spec:1.53
--- SPECS/meld.spec:1.52        Sat Sep 22 01:56:55 2007
+++ SPECS/meld.spec     Sun Nov 11 12:50:21 2007
@@ -6,10 +6,10 @@
 Summary(pl.UTF-8):     Wizualne narzędzie do oglądania i włączania zmian (diff)
 Name:          meld
 Version:       1.1.5
-Release:       1
+Release:       2
 License:       GPL
 Group:         Applications/Text
-Source0:       
http://ftp.gnome.org/pub/gnome/sources/meld/1.1/%{name}-%{version}.tar.bz2
+Source0:       
http://ftp.gnome.org/pub/GNOME/sources/meld/1.1/%{name}-%{version}.tar.bz2
 # Source0-md5: a92e72a3b4392ee3e677720f9a75246f
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-GNUmakefile.patch
@@ -17,6 +17,8 @@
 BuildRequires: gettext-devel
 BuildRequires: python-gnome-devel >= 2.15.1
 BuildRequires: python-pyorbit-devel >= 2.14.0
+# support for --with-omf in find_lang.sh
+BuildRequires: rpm-build >= 4.4.9-10
 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: scrollkeeper
 Requires(post,postun): desktop-file-utils
@@ -27,6 +29,8 @@
 Requires:      python-pygtk-glade >= 2:2.9.0
 Requires:      python-pyorbit >= 2.14.0
 Suggests:      python-gnome-desktop-gtksourceview
+# [EMAIL PROTECTED] vs. [EMAIL PROTECTED]
+Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -51,6 +55,8 @@
 %patch0 -p1
 %patch1 -p1
 
+mv -f po/[EMAIL PROTECTED],latin}.po
+
 %build
 # Nasty quickfix - some translations are broken for now
 rm -f po/{hu,ja,ru}.po
@@ -74,7 +80,7 @@
 
 %py_postclean
 
-%find_lang %{name} --with-gnome
+%find_lang %{name} --with-gnome --with-omf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -97,7 +103,6 @@
 %{_datadir}/%{name}
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/*
-%{_omf_dest_dir}/%{name}
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -105,6 +110,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53  2007-11-11 11:50:21  megabajt
+- [EMAIL PROTECTED] -> [EMAIL PROTECTED]
+- use --with-omf
+- release 2
+
 Revision 1.52  2007-09-21 23:56:55  wolf
 - S: python-gnome-desktop-gtksourceview
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/meld.spec?r1=1.52&r2=1.53&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to