summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.cvsignore2
-rw-r--r--bibus-build-1.4.3.1.patch29
-rw-r--r--bibus.spec23
-rw-r--r--sources2
4 files changed, 44 insertions, 12 deletions
diff --git a/.cvsignore b/.cvsignore
index 460cd4e..4d8675e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-bibus_1.4.3-2.tar.gz
+bibus-1.4.3.1.tar.gz
diff --git a/bibus-build-1.4.3.1.patch b/bibus-build-1.4.3.1.patch
new file mode 100644
index 0000000..540d095
--- /dev/null
+++ b/bibus-build-1.4.3.1.patch
@@ -0,0 +1,29 @@
+--- 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)
diff --git a/bibus.spec b/bibus.spec
index b27533d..317f0db 100644
--- a/bibus.spec
+++ b/bibus.spec
@@ -1,12 +1,14 @@
Name: bibus
-Version: 1.4.3
-Release: 2%{?dist}
+Version: 1.4.3.1
+Release: 1%{?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 @@ OpenOffice.org and MS Word and generate the bibliographic index.
%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
@@ -82,12 +85,6 @@ sed -i "s:doc/bibus:doc/bibus-%{version}:" $RPM_BUILD_ROOT%{_datadir}/%{name}/bi
## 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 +108,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* 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@gmail.com> - 1.4.3-2
- Rebuild for Python 2.6
diff --git a/sources b/sources
index 7b30d26..5d90fcc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8e1e13469fa4099c384009a0350c926a bibus_1.4.3-2.tar.gz
+1924aaca754e55464635647a5b6d8063 bibus-1.4.3.1.tar.gz