rpms/bibus/F-10 bibus-build-1.4.3.1.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 bibus.spec, 1.2, 1.3 sources, 1.3, 1.4
Alex Lancaster
alexlan at fedoraproject.org
Tue Jan 13 05:58:52 UTC 2009
Author: alexlan
Update of /cvs/extras/rpms/bibus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22856
Modified Files:
.cvsignore bibus.spec sources
Added Files:
bibus-build-1.4.3.1.patch
Log Message:
* Mon Jan 12 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.3.1-2
- Fix paths to openoffice (#479099)
* Mon Dec 1 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.3.1-1
- Updating to new upstream (1.4.3.1)
- Adds support for OpenOffice 3.x
- Add patch to fix broken Makefile and desktop file
- Cleanup .spec
bibus-build-1.4.3.1.patch:
--- NEW FILE bibus-build-1.4.3.1.patch ---
--- Setup/bibus.desktop.orig 2008-12-01 22:39:16.000000000 -0700
+++ Setup/bibus.desktop 2008-12-01 22:40:05.000000000 -0700
@@ -6,6 +6,7 @@
Name[de]=Bibus
Name[fr]=Bibus
Name[hu]=Bibus
+GenericName=Bibus bibliographic database
GenericName[en]=Bibus bibliographic database
GenericName[de]=Bibliographische Datenbank Bibus
GenericName[fr]=Base de donnée bibliographique Bibus
@@ -19,6 +20,5 @@
Type=Application
Terminal=false
Exec=bibus
-Icon=bibus.png
+Icon=bibus
StartupNotify=true
-
--- Makefile.orig 2008-12-01 22:38:59.000000000 -0700
+++ Makefile 2008-12-01 22:39:26.000000000 -0700
@@ -35,8 +35,6 @@
# freedesktop icon and shortcut
install -m644 Pixmaps/bibus.png -D $(datadir)/icons/hicolor/48x48/apps/bibus.png
install -m644 Setup/bibus.desktop -D $(datadir)/applications/bibus.desktop
- echo 'Exec=$(bindir)/bibus' >> $(datadir)/applications/bibus.desktop
- echo 'Icon=$(datadir)/icons/hicolor/48x48/apps/bibus.png' >> $(datadir)/applications/bibus.desktop
# bibus command
install -d $(bindir)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bibus/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 10 Jun 2008 10:08:47 -0000 1.3
+++ .cvsignore 13 Jan 2009 05:58:22 -0000 1.4
@@ -1 +1 @@
-bibus_1.4.3-2.tar.gz
+bibus-1.4.3.1.tar.gz
Index: bibus.spec
===================================================================
RCS file: /cvs/extras/rpms/bibus/F-10/bibus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bibus.spec 10 Jun 2008 10:08:47 -0000 1.2
+++ bibus.spec 13 Jan 2009 05:58:22 -0000 1.3
@@ -1,12 +1,14 @@
Name: bibus
-Version: 1.4.3
-Release: 1%{?dist}
+Version: 1.4.3.1
+Release: 2%{?dist}
Summary: Bibliographic and reference management software
Group: Applications/Publishing
License: GPLv2+
URL: http://bibus-biblio.sourceforge.net/
-Source0: http://downloads.sourceforge.net/bibus-biblio/%{name}_%{version}-2.tar.gz
+Source0: http://downloads.sourceforge.net/bibus-biblio/%{name}-%{version}.tar.gz
+
+Patch0: %{name}-build-1.4.3.1.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## temporarily removing noarch to workaround this bug:
@@ -32,7 +34,8 @@
%prep
-%setup -q -n %{name}1.4
+%setup -q -n %{name}-%{version}
+%patch0 -p0
## make files UTF-8
for i in bibMSW.htm eTBlast\ Interface\ to\ Bibus.htm
@@ -60,7 +63,9 @@
%install
rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT/%{_prefix} sysconfdir=$RPM_BUILD_ROOT/etc oopath=%{_libdir}/openoffice.org/program/ install
+make DESTDIR=$RPM_BUILD_ROOT/%{_prefix} sysconfdir=$RPM_BUILD_ROOT/etc \
+ oopath=%{_libdir}/openoffice.org3/program/ ooure=%{_libdir}/openoffice.org/basis3.0/ure-link/lib \
+ oobasis=%{_libdir}/openoffice.org/basis3.0/program install
## fix symlink
rm $RPM_BUILD_ROOT%{_bindir}/bibus
@@ -82,12 +87,6 @@
## remove uninstall program, not necessary for RPM package
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/Setup/uninstall.sh
-## fix bibus.desktop to fix binary and icon locations
-sed -i "s:$RPM_BUILD_ROOT::" $RPM_BUILD_ROOT%{_datadir}/applications/bibus.desktop
-
-## remove localization from generic name
-sed -i 's/GenericName\[fr_FR\]/GenericName/' $RPM_BUILD_ROOT%{_datadir}/applications/bibus.desktop
-
desktop-file-install --vendor="fedora" \
--delete-original \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
@@ -111,6 +110,18 @@
%changelog
+* Mon Jan 12 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.3.1-2
+- Fix paths to openoffice (#479099)
+
+* Mon Dec 1 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.3.1-1
+- Updating to new upstream (1.4.3.1)
+- Adds support for OpenOffice 3.x
+- Add patch to fix broken Makefile and desktop file
+- Cleanup .spec
+
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.4.3-2
+- Rebuild for Python 2.6
+
* Tue Jun 10 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.3-1
- Update to latest upstream (1.4.3)
- Make package arch-specific to allow package to find appropriate location
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bibus/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 10 Jun 2008 10:08:47 -0000 1.3
+++ sources 13 Jan 2009 05:58:22 -0000 1.4
@@ -1 +1 @@
-8e1e13469fa4099c384009a0350c926a bibus_1.4.3-2.tar.gz
+1924aaca754e55464635647a5b6d8063 bibus-1.4.3.1.tar.gz
More information about the scm-commits
mailing list