rpms/sugar-toolkit/devel remove-pseudopo.patch, NONE, 1.1 sugar-toolkit.spec, 1.19, 1.20

[Simon Schampijer]

Author: erikos

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17785

Modified Files:
	sugar-toolkit.spec 
Added Files:
	remove-pseudopo.patch 
Log Message:
* Tue Sep 9 2008 Simon Schampijer <simon at laptop.org> - 0.82.5-4
- remove pseudo.po from the source tarball



remove-pseudopo.patch:

--- NEW FILE remove-pseudopo.patch ---
diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuilder.py
index a6b8ea5..ecf71e4 100644
--- a/src/sugar/activity/bundlebuilder.py
+++ b/src/sugar/activity/bundlebuilder.py
@@ -190,20 +190,28 @@ class XOPackager(Packager):
         bundle_zip.close()
 
 class SourcePackager(Packager):
+    IGNORE = 'po/pseudo.po'
+
     def __init__(self, config):
         Packager.__init__(self, config)
         self.package_path = os.path.join(self.config.dist_dir,
                                          self.config.tar_name)
 
     def get_files(self):
+        files = []
         git_ls = subprocess.Popen('git-ls-files', stdout=subprocess.PIPE, 
                                   cwd=self.config.source_dir)
         if git_ls.wait():
             # Fall back to filtered list
-            return list_files(self.config.source_dir,
-                              IGNORE_DIRS, IGNORE_FILES)
-        
-        return [path.strip() for path in git_ls.stdout.readlines()]
+            files = list_files(self.config.source_dir,
+                               IGNORE_DIRS, IGNORE_FILES)
+        else:
+            files = [path.strip() for path in git_ls.stdout.readlines()]
+
+        if self.IGNORE in files:
+            files.remove(self.IGNORE)
+
+        return files
 
     def package(self):
         tar = tarfile.open(self.package_path, 'w:bz2')


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sugar-toolkit.spec	4 Sep 2008 01:51:17 -0000	1.19
+++ sugar-toolkit.spec	9 Sep 2008 14:40:25 -0000	1.20
@@ -6,7 +6,7 @@
 Summary: Sugar toolkit
 Name: sugar-toolkit
 Version: 0.82.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 # git clone git://dev.laptop.org/sugar
@@ -19,6 +19,8 @@
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: remove-pseudopo.patch
+
 BuildRequires: pkgconfig
 BuildRequires: pygtk2-devel
 BuildRequires: gettext
@@ -44,6 +46,7 @@
 
 %prep
 %setup -q
+%patch1  -p1 -b .pseudopo
 
 %build
 %configure
@@ -67,6 +70,9 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Tue Sep 9 2008 Simon Schampijer <simon at laptop.org> - 0.82.5-4
+- remove pseudo.po from the source tarball
+
 * Wed Sep  3 2008 Jeremy Katz <katzj at redhat.com> - 0.82.5-3
 - requires gettext for bundlebuilder