rpms/referencer/F-7 referencer-bibtex.patch, NONE, 1.1 referencer-pythondir.patch, 1.1, 1.2 referencer.spec, 1.5, 1.6

[Deji Akingunola (deji)]

Author: deji

Update of /cvs/pkgs/rpms/referencer/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27506

Modified Files:
	referencer-pythondir.patch referencer.spec 
Added Files:
	referencer-bibtex.patch 
Log Message:
* Thu May 22 2008 Deji Akingunola <dakingun at gmail.com> - 1.1.2-2
- Backport upstream fix for crash when importing bibtex file
- Look for plugins in (python_sitelib)/referencer/


referencer-bibtex.patch:

--- NEW FILE referencer-bibtex.patch ---
--- libbibutils/bibtexin.c	Sun Apr 20 23:32:18 2008 +0100
+++ libbibutils/bibtexin.c	Sat Apr 26 20:15:02 2008 +0100
@@ -581,6 +581,7 @@
 				continue;
 			#endif
 			fields_add(info, t->data, d->data, LEVEL_MAIN );
+			continue;
 		}
 		process = ((all[reftype]).tags[n]).processingtype;
 		if ( process == ALWAYS ) continue; /* add these later */

referencer-pythondir.patch:

Index: referencer-pythondir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/referencer/F-7/referencer-pythondir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- referencer-pythondir.patch	26 Apr 2008 18:17:28 -0000	1.1
+++ referencer-pythondir.patch	23 May 2008 00:12:28 -0000	1.2
@@ -17,3 +17,25 @@
  plugin_DATA = pubmed.py lyx.py lyx.png
  EXTRA_DIST = \
  	$(plugin_DATA)
+--- src/Makefile.am	2008-04-19 11:41:31.000000000 -0400
++++ src/Makefile.am.new	2008-05-22 19:16:59.000000000 -0400
+@@ -4,7 +4,7 @@
+ 
+ INCLUDES = -DDATADIR=\""$(pkgdatadir)"\" \
+ 	 -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
+-	 -DPLUGINDIR=\""$(pkglibdir)"\"
++	 -DPLUGINDIR=\""$(pkgpythondir)"\"
+ 
+ LDADD = \
+ 	$(DEPS_LIBS) \
+--- src/Makefile.in	2008-04-19 11:50:45.000000000 -0400
++++ src/Makefile.in.new	2008-05-22 19:19:31.000000000 -0400
+@@ -240,7 +240,7 @@
+ target_alias = @target_alias@
+ INCLUDES = -DDATADIR=\""$(pkgdatadir)"\" \
+ 	-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
+-	-DPLUGINDIR=\""$(pkglibdir)"\" $(am__append_1)
++	-DPLUGINDIR=\""$(pkgpythondir)"\" $(am__append_1)
+ LDADD = $(DEPS_LIBS) $(top_builddir)/libbibutils/libbibutils.a \
+ 	$(am__append_2)
+ referencer_SOURCES = \


Index: referencer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/referencer/F-7/referencer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- referencer.spec	26 Apr 2008 19:04:39 -0000	1.5
+++ referencer.spec	23 May 2008 00:12:28 -0000	1.6
@@ -3,12 +3,13 @@
 Name:		referencer
 Summary:	A document organiser and bibliography manager for Gnome
 Version:	1.1.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Group:		Applications/System
 License:	GPLv2
 URL:		http://icculus.org/referencer
 Source0:	http://icculus.org/referencer/downloads/%{name}-%{version}.tar.gz
 Patch0:		referencer-pythondir.patch
+Patch1:		referencer-bibtex.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	poppler-devel libgnomeuimm26-devel
 BuildRequires:	boost-devel gcc-c++ python-devel
@@ -24,6 +25,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .pyt
+%patch1 -p0 -b .bib
 
 %build
 %configure --disable-update-mime-database
@@ -33,13 +35,15 @@
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
 
+mkdir plugins/doc
+cp -p plugins/README plugins/doc/Plugins_README
+
 desktop-file-install --delete-original			\
 	--vendor fedora					\
 	--remove-category Application			\
 	--dir %{buildroot}%{_datadir}/applications	\
 	%{buildroot}%{_datadir}/applications/%{name}.desktop
 
-
 %find_lang %{name}
 
 %clean
@@ -68,6 +72,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
+%doc plugins/doc/Plugins_README
 %{_bindir}/referencer
 %{_datadir}/applications/fedora-referencer.desktop
 %{_datadir}/icons/hicolor/*/*/*.png
@@ -77,6 +82,10 @@
 %{python_sitelib}/referencer/
 
 %changelog
+* Thu May 22 2008 Deji Akingunola <dakingun at gmail.com> - 1.1.2-2
+- Backport upstream fix for crash when importing bibtex file
+- Look for plugins in (python_sitelib)/referencer/
+
 * Sat Apr 26 2008 Deji Akingunola <dakingun at gmail.com> - 1.1.2-1
 - New release