Author: steletch
Date: Thu Feb 8 14:20:32 2007
New Revision: 117844
Added:
packages/cooker/bibus/current/SOURCES/bibus-1.3.0.tar.bz2 (contents, props
changed)
Removed:
packages/cooker/bibus/current/SOURCES/bibus_1.2.0-1.tar.bz2
Modified:
packages/cooker/bibus/current/SPECS/bibus.spec
Log:
New bibus release
Comment my own desktop entry since desktop-file-install uses bibus' .desktop
Added: packages/cooker/bibus/current/SOURCES/bibus-1.3.0.tar.bz2
==============================================================================
Binary file. No diff available.
Modified: packages/cooker/bibus/current/SPECS/bibus.spec
==============================================================================
--- packages/cooker/bibus/current/SPECS/bibus.spec (original)
+++ packages/cooker/bibus/current/SPECS/bibus.spec Thu Feb 8 14:20:32 2007
@@ -1,13 +1,13 @@
%define name bibus
-%define version 1.2.0
+%define version 1.3.0
%define bibusrel 1
-%define release %mkrel 6
+%define release %mkrel 1
Summary: Bibliographic database manager with OpenOffice.org integration
Name: %{name}
Version: %{version}
Release: %{release}
-Source0: %{name}_%{version}-%{bibusrel}.tar.bz2
+Source0: %{name}-%{version}.tar.bz2
Patch0: bibus-1.2.0-makefile.patch.bz2
Patch1: bibus-1.2.0-fix-desktop-file.patch
Source11: %{name}.16.png
@@ -36,7 +36,7 @@
%prep
%setup -q
-%patch0 -p1
+#%patch0 -p1
%patch1 -p1
find Docs/ -type f -exec chmod 0644 {} \;
mv locale/zh_cn locale_CN
@@ -104,6 +104,16 @@
#EObibus
#chmod 755 $RPM_BUILD_ROOT%{_bindir}/bibus.sh
+# localization
+%find_lang %{name}
+
+# icons
+install -m644 %{SOURCE11} -D $RPM_BUILD_ROOT%{_miconsdir}/%{name}.png
+install -m644 %{SOURCE12} -D $RPM_BUILD_ROOT%{_iconsdir}/%{name}.png
+install -m644 %{SOURCE13} -D $RPM_BUILD_ROOT%{_liconsdir}/%{name}.png
+
+# Menu item, using the provide .desktop file
+
# fix pathnames in bibus.desktop
install -m644 --backup=off Setup/bibus.desktop -D
$RPM_BUILD_ROOT%{_datadir}/applications/bibus.desktop
echo 'Exec=%{_bindir}/bibus' >>
$RPM_BUILD_ROOT%{_datadir}/applications/bibus.desktop
@@ -112,17 +122,9 @@
desktop-file-install --vendor="" \
--remove-category="Application" \
--add-category="GTK" \
- --add-category="X-MandrivaLinux-Office-Wordprocessors" \
+ --add-category="X-MandrivaLinux-Office-Publishing;Office" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications
$RPM_BUILD_ROOT%{_datadir}/applications/*
-# localization
-%find_lang %{name}
-
-# icons
-install -m644 %{SOURCE11} -D $RPM_BUILD_ROOT%{_miconsdir}/%{name}.png
-install -m644 %{SOURCE12} -D $RPM_BUILD_ROOT%{_iconsdir}/%{name}.png
-install -m644 %{SOURCE13} -D $RPM_BUILD_ROOT%{_liconsdir}/%{name}.png
-
# Old menu style
install -d -m 755 $RPM_BUILD_ROOT%{_menudir}
cat << EOF > $RPM_BUILD_ROOT%{_menudir}/%{name}
@@ -136,19 +138,20 @@
xdg="true"
EOF
-# XDG menu
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-cat > $RPM_BUILD_ROOT%{_datadir}/applications/mandriva-%{name}.desktop << EOF
-[Desktop Entry]
-Name=Bibus
-Comment="Bibliographic database manager with OpenOffice.org integration"
-Exec=%{name}
-Icon=%{name}
-Terminal=false
-Type=Application
-Categories=X-MandrivaLinux-Office-Publishing;Office;
-StartupNotify=true
-EOF
+### We don't need this entry since the application provides its own .desktop
file
+### # XDG menu
+### mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+### cat > $RPM_BUILD_ROOT%{_datadir}/applications/mandriva-%{name}.desktop <<
EOF
+### [Desktop Entry]
+### Name=Bibus
+### Comment="Bibliographic database manager with OpenOffice.org integration"
+### Exec=%{name}
+### Icon=%{name}
+### Terminal=false
+### Type=Application
+### Categories=X-MandrivaLinux-Office-Publishing;Office;
+### StartupNotify=true
+### EOF
%clean
rm -rf $RPM_BUILD_ROOT
@@ -171,10 +174,17 @@
%{_bindir}/bibus
%{_datadir}/bibus
%{_datadir}/applications/bibus.desktop
-%{_datadir}/applications/mandriva-%{name}.desktop
+#%{_datadir}/applications/mandriva-%{name}.desktop
%attr(755,root,root) %{_datadir}/%{name}/Pref_Duplicates_Base.py
%attr(755,root,root) %{_datadir}/%{name}/display_panel.py
%attr(755,root,root) %{_datadir}/%{name}/bibus.py
-%attr(755,root,root) %{_datadir}/%{name}/FirstTimeWizard_WP.py
+%attr(755,root,root) %{_datadir}/%{name}/Pref_Display.py
+%attr(755,root,root) %{_datadir}/%{name}/Pref_Search.py
+%attr(755,root,root) %{_datadir}/%{name}/FirstStart/MySQL_Setup.py
+%attr(755,root,root) %{_datadir}/%{name}/FirstStart/FirstTimeWizard_WP.py
+%attr(755,root,root) %{_datadir}/%{name}/FirstStart/Wizard_SQLite.py
+%attr(755,root,root) %{_datadir}/%{name}/FirstStart/Wizard_MySQL.py
+%attr(755,root,root) %{_datadir}/%{name}/FirstStart/FirstTimeWizard_DB.py
+%attr(755,root,root) %{_datadir}/%{name}/CodecChoice.py
%attr(755,root,root) %{_datadir}/%{name}/Pref_Connection.py
%attr(755,root,root) %{_datadir}/%{name}/Pref_DB.py
