rpms/jbrout/F-12 .cvsignore, 1.5, 1.6 import.log, 1.1, 1.2 jbrout.spec, 1.10, 1.11 sources, 1.6, 1.7
Peter Lemenkov
peter at fedoraproject.org
Sun Jan 24 16:57:28 UTC 2010
Author: peter
Update of /cvs/pkgs/rpms/jbrout/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22962/F-12
Modified Files:
.cvsignore import.log jbrout.spec sources
Log Message:
Fixed #558151
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jbrout/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 14 Jul 2009 21:31:53 -0000 1.5
+++ .cvsignore 24 Jan 2010 16:57:28 -0000 1.6
@@ -1 +1 @@
-jbrout.tar.bz2
+jbrout-0.3.282.tar.xz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/jbrout/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 27 Jun 2008 18:20:06 -0000 1.1
+++ import.log 24 Jan 2010 16:57:28 -0000 1.2
@@ -1 +1,2 @@
jbrout-0_2_201-2_fc9:HEAD:jbrout-0.2.201-2.fc9.src.rpm:1214590596
+jbrout-0_3_282-0_1_20100124svn282_fc12:F-12:jbrout-0.3.282-0.1.20100124svn282.fc12.src.rpm:1264352170
Index: jbrout.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jbrout/F-12/jbrout.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- jbrout.spec 5 Nov 2009 00:08:28 -0000 1.10
+++ jbrout.spec 24 Jan 2010 16:57:28 -0000 1.11
@@ -1,20 +1,49 @@
Name: jbrout
-Version: 0.3.211
-Release: 20091105svn270.1%{?dist}
+Version: 0.3.282
+Release: 0.1.20100124svn282%{?dist}
Summary: Photo manager, written in python/pygtk
Group: Applications/Multimedia
License: GPLv2
URL: http://jbrout.python-hosting.com/wiki
-# SVN root http://jbrout.googlecode.com/svn/trunk, revision 270
-Source0: jbrout.tar.bz2
+
+## in order to rebuild Source0 I advice you to type something like
+## cat ../SPECS/jbrout.spec | grep ^# | grep -v "##" | sed s,^#,,g | bash
+
+# svn export -r 282 http://jbrout.googlecode.com/svn/trunk/jbrout jbrout-0.3.282
+# svn export -r 282 http://jbrout.googlecode.com/svn/trunk/readme.txt jbrout-0.3.282/readme.txt
+
+## remove duplicated system libraries
+# rm -rf jbrout-0.3.282/plugins/multiexport/libs/picasaweb/atom/
+# rm -rf jbrout-0.3.282/plugins/multiexport/libs/picasaweb/gdata/
+# rm -f jbrout-0.3.282/data/tools/*.exe
+
+## fix CRLF
+# dos2unix jbrout-0.3.282/plugins/__init__.py
+# dos2unix jbrout-0.3.282/plugins/multiexport/libs/__init__.py
+# dos2unix jbrout-0.3.282/libs/dict4ini.py
+
+## remove unneeded shebang
+# sed -i -e '1d' jbrout-0.3.282/plugins/multiexport/libs/picasaweb/__init__.py
+# sed -i -e '2d' jbrout-0.3.282/jbrout/folderselect.py
+# sed -i -e '1d' jbrout-0.3.282/jbrout/tools.py
+
+## drop executable bit
+# find jbrout-0.3.282 -type f -executable -exec chmod -x {} \;
+
+## compress the rest of the code
+# tar cfJ jbrout-0.3.282.tar.xz jbrout-0.3.282
+
+Source0: %{name}-%{version}.tar.xz
Source1: jbrout-Makefile
Source2: jbrout.desktop
Source3: jbrout-usr_bin
Source4: jbrout-install.sh
BuildArch: noarch
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires: python >= 2.4, python-lxml, pygtk2 >= 2.6
-Requires: python-imaging, pyexiv2 >= 0.1.2, fbida, perl-Image-ExifTool
-BuildRequires: gettext, desktop-file-utils
+Requires: python-imaging, pyexiv2 >= 0.1.2, fbida
+Requires: python-gdata
+BuildRequires: gettext, desktop-file-utils,
%description
jBrout is able to :
@@ -37,40 +66,20 @@ jBrout is able to :
* ...
%prep
-%setup -q -n jbrout
-
-cd jbrout/
-find . -name .svn -print0 | xargs -0 rm -rf
-
-rm -v plugins/multiexport/libs/picasaweb/gdata/tlslite/utils/*.c
-rm -v data/tools/*.exe
-TEMPFILE=$(mktemp %{_tmppath}/jbrout-build.XXXXXX)
-find libs plugins jbrout data -type f -a ! -name \*.png \
- | while read FILE ; do \
- cat $FILE | tr -d '\r' >$TEMPFILE
- mv $TEMPFILE $FILE
- if $(head -n1 $FILE | grep '^#!' >/dev/null 2>&1); then
- sed -i -e '1d' $FILE
- fi
- chmod -x $FILE
- done
-unset TEMPFILE
+%setup -q
install -p %{SOURCE1} Makefile
install -p -m a+rx,u+w %{SOURCE4} install-script
%build
-cd jbrout
make
%install
-cd jbrout
+rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
-install -m a+rx,u+w -d $RPM_BUILD_ROOT%{_bindir}
-install -m a+rx,u+w %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/jbrout
-install -m a+rx,u+w -d $RPM_BUILD_ROOT%{_datadir}/applications/
-install -p -m a+rx,u+w -t $RPM_BUILD_ROOT%{_datadir}/applications/ \
- %{SOURCE2}
+install -D -m a+rx,u+w %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/%{name}
+install -D -p -m a+rx,u+w %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+
desktop-file-install \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category=X-Fedora \
@@ -83,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_bindir}/jbrout
-%doc readme.txt
+%doc readme.txt data/gpl.txt
%{_datadir}/jbrout/
%exclude %{_datadir}/jbrout/plugins/*/po/*/LC_MESSAGES/plugin.mo
%lang(fr) %{_datadir}/jbrout/plugins/*/po/fr/LC_MESSAGES/plugin.mo
@@ -91,9 +100,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/applications/jbrout.desktop
%changelog
-* Thu Nov 05 2009 Rahul Sundaram <sundaram at fedoraproject.org> - 0.3.211-20091105svn270.1
-- Pull latest svn snapshot
-- Add dependencies to fix startup crash and improve performance
+* Sun Jan 24 2010 Peter Lemenkov <lemenkov at gmail.com> 0.3.282-0.1.20100124svn282
+- Updated to svn ver. 282
+- Fixed #558151
+- Added BR python-gdata
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.174-4.0.20090714svn223.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jbrout/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources 5 Nov 2009 00:08:28 -0000 1.6
+++ sources 24 Jan 2010 16:57:28 -0000 1.7
@@ -1 +1 @@
-caf451c55022fbbbda09b0f7ea681d65 jbrout.tar.bz2
+ed49063bc8a6212342724c0127301c34 jbrout-0.3.282.tar.xz
More information about the scm-commits
mailing list