rpms/jbrout/F-10 jbrout-install.sh, NONE, 1.1 .cvsignore, 1.2, 1.3 jbrout-Makefile, 1.1, 1.2 jbrout-usr_bin, 1.1, 1.2 jbrout.desktop, 1.1, 1.2 jbrout.spec, 1.1, 1.2 sources, 1.2, 1.3

Matej Cepl mcepl at fedoraproject.org
Thu Jan 15 16:46:22 UTC 2009 

Author: mcepl

Update of /cvs/extras/rpms/jbrout/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7503

Modified Files:
	.cvsignore jbrout-Makefile jbrout-usr_bin jbrout.desktop 
	jbrout.spec sources 
Added Files:
	jbrout-install.sh 
Log Message:
New upstream release -- substantial change


--- NEW FILE jbrout-install.sh ---
#!/bin/sh
set -x
DESTDIR=$1

install -m a+rx,u+w -d $DESTDIR/usr/share/jbrout/
cp -r plugins libs jbrout data $DESTDIR/usr/share/jbrout/
find po |while read NAME ; do \
	if [ -d $NAME ] ; then \
		install -m a+rx,u+w -d $DESTDIR/usr/share/locale/$NAME ;\
	elif [ $NAME == *.mo ] ; then \
		install -p -m a+r,u+w $NAME "$DESTDIR/usr/share/jbrout/locale/$NAME" ;\
	fi ;\
done
chmod -R a+rX,u+w plugins $DESTDIR/usr/share/
install -p -m a+r,u+w -t $DESTDIR/usr/share/jbrout/ *.py
install -p -m a+r,u+w -t $DESTDIR/usr/share/jbrout/ data/gpl.txt
install -p -m a+r,u+w -t $DESTDIR/usr/share/jbrout/ data/jbrout.glade
chmod +x $DESTDIR/usr/share/jbrout/jbrout.py



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jbrout/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Jun 2008 18:20:06 -0000	1.2
+++ .cvsignore	15 Jan 2009 16:45:52 -0000	1.3
@@ -1 +1 @@
-jbrout-0.2.201.sources.tar.gz
+jbrout_0.3.159.tar.gz


Index: jbrout-Makefile
===================================================================
RCS file: /cvs/extras/rpms/jbrout/F-10/jbrout-Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jbrout-Makefile	27 Jun 2008 18:20:06 -0000	1.1
+++ jbrout-Makefile	15 Jan 2009 16:45:52 -0000	1.2
@@ -3,18 +3,7 @@
 all: build
 
 install:
-	install -m a+rx,u+w -d $(DESTDIR)/usr/share/jbrout/
-	cp -r plugins gfx libs $(DESTDIR)/usr/share/jbrout/
-	find po \
-		-type d -exec install -m a+rx,u+w \
-			-d $(DESTDIR)/usr/share/locale/{} \; \
-		-o -name \*.mo -exec \
-			install -p -m a+r,u+w {} $(DESTDIR)/usr/share/jbrout/po/{} \;
-	chmod -R a+rX,u+w plugins $(DESTDIR)/usr/share/
-	install -p -m a+r,u+w -t $(DESTDIR)/usr/share/jbrout/ *.py
-	install -p -m a+r,u+w -t $(DESTDIR)/usr/share/jbrout/ gpl.txt
-	install -p -m a+r,u+w -t $(DESTDIR)/usr/share/jbrout/ jbrout.glade
-	chmod +x $(DESTDIR)/usr/share/jbrout/jbrout.py
+	./install-script $(DESTDIR)
 
 build:
-	/bin/true
+	find po -name \*.po -exec msgfmt -vc '{}' \;


Index: jbrout-usr_bin
===================================================================
RCS file: /cvs/extras/rpms/jbrout/F-10/jbrout-usr_bin,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jbrout-usr_bin	27 Jun 2008 18:20:06 -0000	1.1
+++ jbrout-usr_bin	15 Jan 2009 16:45:52 -0000	1.2
@@ -7,4 +7,5 @@
     exit 1
 fi
 
+cd $(dirname $APPPATH)
 "$PYTHON" "$APPPATH" "$@"


Index: jbrout.desktop
===================================================================
RCS file: /cvs/extras/rpms/jbrout/F-10/jbrout.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jbrout.desktop	27 Jun 2008 18:20:06 -0000	1.1
+++ jbrout.desktop	15 Jan 2009 16:45:52 -0000	1.2
@@ -5,7 +5,7 @@
 GenericName[cs]=Správce fotografické sbírky
 Type=Application
 Exec=/usr/bin/jbrout
-Icon=/usr/share/jbrout/gfx/jbrout.ico
+Icon=/usr/share/jbrout/data/gfx/jbrout.png
 Terminal=false
 StartupNotify=true
 Categories=GNOME;GTK;Graphics;Viewer;RasterGraphics;Photography;


Index: jbrout.spec
===================================================================
RCS file: /cvs/extras/rpms/jbrout/F-10/jbrout.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jbrout.spec	27 Jun 2008 18:20:06 -0000	1.1
+++ jbrout.spec	15 Jan 2009 16:45:52 -0000	1.2
@@ -1,18 +1,20 @@
 Name:           jbrout
-Version:        0.2.201
-Release:        2%{?dist}
+Version:        0.3.159
+Release:        1%{?dist}
 Summary:        Photo manager, written in python/pygtk
 Group:          Applications/Multimedia
 License:        GPLv2
 URL:            http://jbrout.python-hosting.com/wiki
-Source0:        http://jbrout.free.fr/download/sources/jbrout-%{version}.sources.tar.gz
+Source0:        http://jbrout.free.fr/download/sources/jbrout_%{version}.tar.gz
+#Source0:        jbrout.tar.bz2
 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, python-imaging, fbida, jhead
-BuildRequires:  gettext, desktop-file-utils, 
+Requires:       python >= 2.4, python-lxml, pygtk2 >= 2.6, python-imaging, pyexiv2 >= 0.1.2
+BuildRequires:  gettext, desktop-file-utils,
 
 %description
 jBrout is able to :
@@ -36,8 +38,10 @@
 
 %prep
 %setup -q -n jbrout
+
+cd jbrout/
 TEMPFILE=$(mktemp %{_tmppath}/jbrout-build.XXXXXX)
-find libs plugins -type f \
+find libs plugins jbrout data -type f -a ! -name \*.png \
    | while read FILE ; do \
       cat $FILE | tr -d '\r' >$TEMPFILE
       mv $TEMPFILE $FILE
@@ -47,21 +51,24 @@
       chmod -x $FILE
    done
 unset TEMPFILE
-sed -i -e '1d' trackertag.py
-chmod -x SciTE.properties
+#sed -i -e '1d' trackertag.py
+#chmod -x SciTE.properties
 install -p %{SOURCE1} Makefile
-install -p %{SOURCE2} .
+install -p -m a+rx,u+w %{SOURCE4} install-script
 
 %build
+cd jbrout
+make DESTDIR=$RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd jbrout
 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/ \
-      jbrout.desktop
+      %{SOURCE2}
 desktop-file-install \
      --dir $RPM_BUILD_ROOT%{_datadir}/applications \
      --add-category=X-Fedora \
@@ -74,7 +81,7 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/jbrout
-%doc readme.txt SciTE.properties
+%doc
 %{_datadir}/jbrout/
 %exclude %{_datadir}/jbrout/plugins/*/po/*/LC_MESSAGES/plugin.mo
 %lang(fr) %{_datadir}/jbrout/plugins/*/po/fr/LC_MESSAGES/plugin.mo
@@ -82,6 +89,16 @@
 %{_datadir}/applications/jbrout.desktop
 
 %changelog
+* Thu Jan 15 2009 Matěj Cepl <mcepl at redhat.com> 0.3.159-1
+- New upstream release and this should go to Fedora.
+
+* Sun Jan 11 2009 Matěj Cepl <mcepl at redhat.com> 0.3.151-0.5
+- Fixed building and installing lang files.
+
+* Thu Jan 01 2009 Matěj Cepl <mcepl at redhat.com> 0.3.131-0.1.f10only
+- Testing build of the new upstream release (because of broken upgrade
+  build).
+
 * Thu Jun 26 2008 Matěj Cepl <mcepl at redhat.com> 0.2.201-2
 - Fixing packaging bugs mentioned in the package review.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jbrout/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jun 2008 18:20:06 -0000	1.2
+++ sources	15 Jan 2009 16:45:52 -0000	1.3
@@ -1 +1 @@
-202e2a11517f33d4459e8ef95ee6c559  jbrout-0.2.201.sources.tar.gz
+b78c1be437b91adfa70a59c16a094d30  jbrout_0.3.159.tar.gz

More information about the scm-commits mailing list