diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e6dcd1f..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -bibus-1.5.1.tar.gz -/bibus_1.5.2.orig.tar.gz diff --git a/bibus-build-1.4.3.1.patch b/bibus-build-1.4.3.1.patch deleted file mode 100644 index 540d095..0000000 --- a/bibus-build-1.4.3.1.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- 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-build-1.5.1.patch b/bibus-build-1.5.1.patch deleted file mode 100644 index a57cc91..0000000 --- a/bibus-build-1.5.1.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 -- diff --git a/bibus.spec b/bibus.spec deleted file mode 100644 index aa7dc1f..0000000 --- a/bibus.spec +++ /dev/null @@ -1,230 +0,0 @@ -# This package depends on automagic byte compilation -# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2 -%global _python_bytecompile_extra 1 - -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} -%global debug_package %{nil} - -Name: bibus -Version: 1.5.2 -Release: 10%{?dist} -Summary: Bibliographic and reference management software - -License: GPLv2+ -URL: http://bibus-biblio.sourceforge.net/ -Source0: http://downloads.sourceforge.net/bibus-biblio/%{name}_%{version}.orig.tar.gz - -Patch0: %{name}-build-1.5.1.patch -Patch1: wxpy30-changes.patch - -## temporarily removing noarch to workaround this bug: -## https://bugzilla.redhat.com/show_bug.cgi?id=438527 -## also filed with bibus upstream: -## http://sourceforge.net/tracker/index.php?func=detail&aid=1989580&group_id=110943&atid=657832 -##BuildArch: noarch - -BuildRequires: python2-devel python-unversioned-command -BuildRequires: desktop-file-utils -BuildRequires: gettext -Requires: python2-wxpython > 2.6 -Requires: python2-mysql -Requires: libreoffice-writer -Requires: libreoffice-pyuno - - -%description -Bibus is a bibliographic database. It uses a MySQL or SQLite database -to store references. It can directly insert references in -LibreOffice and MS Word and generate the bibliographic index. - - -%prep -%setup -q -n %{name}-%{version} -%patch0 -p0 -%patch1 -p1 - -## make files UTF-8 -for i in bibMSW.htm eTBlast\ Interface\ to\ Bibus.htm -do - /usr/bin/iconv -f iso8859-1 -t utf-8 "Docs/html/en/${i}" > "Docs/html/en/${i}.conv" && /bin/mv -f "Docs/html/en/${i}.conv" "Docs/html/en/${i}" -done - -## remove all CVS version control files -find . -type d -name CVS -print0 | xargs --null rm -rf - -## fix line endings -##find Docs -type f -exec sed -i 's/\r//' {} 2>/dev/null ';' -find Docs -type f -name '*ml' -exec sed -i 's/\r//' {} 2>/dev/null ';' - -## remove she-bang lines in .py files to keep rpmlint happy -find . -type f -name "*.py" -exec sed -i '/^#![ ]*\/usr\/bin\/.*$/ d' {} 2>/dev/null ';' - -## restore she-bang line for bibusStart.py -sed -i '1i #!/usr/bin/env python2' bibusStart.py - -## remove non-standard zh_cn locale directory -rm -r locale/zh_cn - -%build - -%install -make DESTDIR=$RPM_BUILD_ROOT/%{_prefix} sysconfdir=$RPM_BUILD_ROOT/etc \ - oopath=%{_libdir}/libreoffice/program/ ooure=%{_libdir}/libreoffice/ure/lib \ - oobasis=%{_libdir}/libreoffice/basis-link/program install - -## fix symlink -rm $RPM_BUILD_ROOT%{_bindir}/bibus -ln -s %{_datadir}/%{name}/bibusStart.py $RPM_BUILD_ROOT%{_bindir}/bibus - -## also install ScreenShots subdirectory, missed by Makefile -install -d $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/html/ScreenShots/ -install -m644 Docs/html/ScreenShots/*.png $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/html/ScreenShots/ - -if [ "%{_datadir}/doc/%{name}" != "%{_pkgdocdir}" ]; then - ## fix location of doc directory to include version - mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version} - - ## fix bibus.cfg to fix documentation location - sed -i "s:doc/bibus:doc/bibus-%{version}:" $RPM_BUILD_ROOT%{_datadir}/%{name}/bibus.cfg -fi - -## fix bibus.cfg to remove $RPM_BUILD_ROOT -sed -i "s:$RPM_BUILD_ROOT::" $RPM_BUILD_ROOT%{_datadir}/%{name}/bibus.cfg - -## remove uninstall program, not necessary for RPM package -rm $RPM_BUILD_ROOT%{_datadir}/%{name}/Setup/uninstall.sh - -desktop-file-install \ - --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ - --remove-category="Application" \ - ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop - -%{find_lang} %{name} - -%files -f %{name}.lang -%doc %{_pkgdocdir} -%{_bindir}/bibus -%{_datadir}/%{name} -%{_datadir}/applications/* -%{_datadir}/icons/hicolor/48x48/apps/* -%{_mandir}/man1/* -%config(noreplace) %{_sysconfdir}/* - -%changelog -* Wed Jul 24 2019 Fedora Release Engineering - 1.5.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 1.5.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 19 2018 Ankur Sinha - 1.5.2-8 -- Update for https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package - -* Thu Jul 12 2018 Fedora Release Engineering - 1.5.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 28 2018 Iryna Shcherbina - 1.5.2-6 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Wed Feb 07 2018 Fedora Release Engineering - 1.5.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 1.5.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.5.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.5.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Dec 03 2016 Filipe Rosset - 1.5.2-1 -- Rebuilt for new upstream release 1.5.2, fixes rhbz #757675 -- Added patch to fixes rhbz #1190916 (thanks to Scott Talbert) - -* Wed Feb 03 2016 Fedora Release Engineering - 1.5.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1.5.1-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Aug 15 2014 Fedora Release Engineering - 1.5.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 1.5.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Jan 18 2014 Ville Skyttä - 1.5.1-11 -- Adapt to unversioned docdirs where applicable (#993684). -- Fix bogus date in %%changelog. - -* Sat Aug 03 2013 Fedora Release Engineering - 1.5.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Feb 11 2013 Rahul Sundaram - 1.5.1-9 -- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247 -- clean up spec to follow current guidelines - -* Wed Jul 18 2012 Fedora Release Engineering - 1.5.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed Feb 8 2012 Toshio Kuratomi - 1.5.1-7 -- Remove python-sqlite2 dep as bibus can use the sqlite3 module from the stdlib - -* Thu Jan 12 2012 Fedora Release Engineering - 1.5.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 1.5.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Oct 30 2010 Caolán McNamara - 1.5.1-4 -- rebuild against LibreOffice - -* Wed Aug 11 2010 David Malcolm - 1.5.1-3 -- recompiling .py files against Python 2.7 (rhbz#623278) - -* Mon Mar 8 2010 Alex Lancaster - 1.5.1-2 -- Disable debuginfo package (#547493) - -* Wed Dec 9 2009 Alex Lancaster - 1.5.1-1 -- Update to latest upstream (1.5.1) -- Should fix connection problem with newer OpenOffice.org (#545809) - -* Fri Jul 24 2009 Fedora Release Engineering - 1.4.3.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Feb 23 2009 Fedora Release Engineering - 1.4.3.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Jan 12 2009 Alex Lancaster - 1.4.3.1-2 -- Fix paths to openoffice (#479099) - -* Mon Dec 1 2008 Alex Lancaster - 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 - 1.4.3-2 -- Rebuild for Python 2.6 - -* Tue Jun 10 2008 Alex Lancaster - 1.4.3-1 -- Update to latest upstream (1.4.3) -- Make package arch-specific to allow package to find appropriate location - for x86_64 (#438527) -- Fix PNG corruption introduced by fixing line-feeds, patch thanks to - Nicolas Thierry-Mieg (#448483) -- Add missing images to doc - -* Thu Mar 13 2008 Alex Lancaster - 1.4.1-4 -- Require python-sqlite2, not sqlite - -* Thu Mar 13 2008 Alex Lancaster - 1.4.1-3 -- Fix desktop-file-install as per review (#436619) - -* Tue Mar 11 2008 Alex Lancaster - 1.4.1-2 -- Require sqlite for sqlite backend - -* Sat Mar 8 2008 Alex Lancaster - 1.4.1-1 -- Initial Fedora package diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..6204ba9 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +No Python 2 support diff --git a/sources b/sources deleted file mode 100644 index 2fc13e6..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -5bb8b26d0980ebb72a2882b618fbe62c bibus_1.5.2.orig.tar.gz diff --git a/wxpy30-changes.patch b/wxpy30-changes.patch deleted file mode 100644 index b534867..0000000 --- a/wxpy30-changes.patch +++ /dev/null @@ -1,158 +0,0 @@ -Author: Jan Beyer -Copyright: Copyright 2014 Jan Beyer -License: The same as the Bibus packaging. -Description: Patch to migrate bibus from wxpython2.8 to wxpython 3.0 - Thanks to Olly Betts for the script that did the main work: - http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git - ---- a/ShortcutEd.py -+++ b/ShortcutEd.py -@@ -27,7 +27,7 @@ - self.category = category # edited category - self.short = short # current shortcuts list - # begin wxGlade: Capture.__init__ -- kwds["style"] = wx.DIALOG_MODAL|wx.CAPTION|wx.RESIZE_BORDER|wx.THICK_FRAME -+ kwds["style"] = wx.CAPTION|wx.RESIZE_BORDER|wx.RESIZE_BORDER - wx.Dialog.__init__(self, *args, **kwds) - self.label_1 = wx.StaticText(self, -1, _("Capture from field")) - self.choice_field = wx.Choice(self, -1, choices=[]) -@@ -110,7 +110,7 @@ - self.parentshort = short # we keep a copy for updating it latter - self.db = db # connection to the database - # begin wxGlade: ShortcutEd.__init__ -- kwds["style"] = wx.DIALOG_MODAL|wx.CAPTION|wx.RESIZE_BORDER|wx.THICK_FRAME -+ kwds["style"] = wx.CAPTION|wx.RESIZE_BORDER|wx.RESIZE_BORDER - wx.Dialog.__init__(self, *args, **kwds) - self.list_shortcuts = wx.ListCtrl(self, -1, style=wx.LC_REPORT|wx.LC_EDIT_LABELS|wx.LC_NO_HEADER|wx.LC_SINGLE_SEL|wx.SUNKEN_BORDER) - self.button_new = wx.Button(self, -1, _("New")) ---- a/bibus.py -+++ b/bibus.py -@@ -120,7 +120,7 @@ - # - class Bibus(wx.App): - def OnInit(self): -- wx.InitAllImageHandlers() -+ # no-op in wxPython2.8 and later: wx.InitAllImageHandlers() - self.SetAppName(APPNAME) - # reading and eventually converting the config file - if os.path.isfile( wx.StandardPaths.Get().GetUserDataDir() ): # old config file in $HOME/.bibus ---- a/Pref_Shortcuts.py -+++ b/Pref_Shortcuts.py -@@ -26,7 +26,7 @@ - def __init__(self, categories, *args, **kwds): - self.categories = categories # current categories in parent. may be different from BIB.SHORTCUTS - # begin wxGlade: NewCategory.__init__ -- kwds["style"] = wx.DIALOG_MODAL|wx.CAPTION|wx.RESIZE_BORDER|wx.THICK_FRAME -+ kwds["style"] = wx.CAPTION|wx.RESIZE_BORDER|wx.RESIZE_BORDER - wx.Dialog.__init__(self, *args, **kwds) - self.label_1 = wx.StaticText(self, -1, _("Name")) - self.text_ctrl_name = wx.TextCtrl(self, -1, "") -@@ -80,7 +80,7 @@ - def onFile(self,evt): - tmpfilen = self.text_ctrl_name.GetValue() - if not tmpfilen: tmpfilen = 'shortcut' -- filen = wx.FileSelector(_("Choose the file location and name"),default_filename=tmpfilen,parent=self, flags = wx.SAVE ) -+ filen = wx.FileSelector(_("Choose the file location and name"),default_filename=tmpfilen,parent=self, flags = wx.FD_SAVE ) - if filen: - self.text_ctrl_filen.SetValue(filen) - ---- a/moveFile.py -+++ b/moveFile.py -@@ -96,7 +96,7 @@ - - if __name__ == "__main__": - app = wx.PySimpleApp(0) -- wx.InitAllImageHandlers() -+ # no-op in wxPython2.8 and later: wx.InitAllImageHandlers() - dialog_1 = MoveFile(None, -1, "") - app.SetTopWindow(dialog_1) - dialog_1.Show() ---- a/OOo.py -+++ b/OOo.py -@@ -103,7 +103,7 @@ - self.saveDoc() - self.finalize() - except bibOOo_IOError: -- url = wx.FileSelector('Save as...',default_extension='odt',wildcard="%s (*.odt)|*.odt|%s (*.sxw)|*.sxw|%s (*.*)|*.*"%(_("OpenDocument Text"),_("OpenOffice.org Text Document"), _("All files")),flags=wx.SAVE|wx.OVERWRITE_PROMPT) -+ url = wx.FileSelector('Save as...',default_extension='odt',wildcard="%s (*.odt)|*.odt|%s (*.sxw)|*.sxw|%s (*.*)|*.*"%(_("OpenDocument Text"),_("OpenOffice.org Text Document"), _("All files")),flags=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT) - if url == '': - return - else: ---- a/BibFrame.py -+++ b/BibFrame.py -@@ -971,7 +971,7 @@ - - def __getFile(self,question=_("Please choose the file encoding"),mode='r',enc='ascii'): - """Get file and encoding. Return open file or None""" -- dlg = wx.FileDialog(self,_("Choose a File to import"),style = wx.OPEN | wx.CHANGE_DIR) -+ dlg = wx.FileDialog(self,_("Choose a File to import"),style = wx.FD_OPEN | wx.FD_CHANGE_DIR) - try: - answer = dlg.ShowModal() - filename = dlg.GetPath() -@@ -1048,7 +1048,7 @@ - # --------------------------------- File Export -------------------------------------------- - def __saveFile(self,question=_("Please choose the file encoding"),mode='r',enc='latin_1'): - """Get file and encoding. Return open file or None""" -- dlg = wx.FileDialog(self,_("Save as..."),style = wx.SAVE | wx.OVERWRITE_PROMPT | wx.CHANGE_DIR) -+ dlg = wx.FileDialog(self,_("Save as..."),style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT | wx.FD_CHANGE_DIR) - try: - answer = dlg.ShowModal() - filename = dlg.GetPath() -@@ -1124,7 +1124,7 @@ - - def __saveFileHTML(self,question=_("Choose the destination file"),mode='w'): - """Get file. Return open file or None""" -- dlg = wx.FileDialog(self,_("Save as..."),style = wx.SAVE | wx.OVERWRITE_PROMPT | wx.CHANGE_DIR) -+ dlg = wx.FileDialog(self,_("Save as..."),style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT | wx.FD_CHANGE_DIR) - try: - answer = dlg.ShowModal() - finally: -@@ -1176,7 +1176,7 @@ - ret = wx.GetSingleChoiceIndex(_('What do you want to export?'),_('Export'),[_('Selection'),_('Current key'),_('All')]) - if ret == -1: return - # get the file destination -- answer = wx.FileSelector(_("Choose the name of the SQLite database"), flags = wx.SAVE | wx.OVERWRITE_PROMPT | wx.CHANGE_DIR ) -+ answer = wx.FileSelector(_("Choose the name of the SQLite database"), flags = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT | wx.FD_CHANGE_DIR ) - if answer == '': return - # we create the database - try: -@@ -1746,7 +1746,7 @@ - - arcstarttime=time.time() - archivename=time.strftime('bibusbackup_%y%m%d_%H%M%S.tar', time.localtime(arcstarttime)) -- dlg = wx.FileDialog(self,_("Archive all user data into file ..."),style = wx.SAVE | wx.OVERWRITE_PROMPT | wx.CHANGE_DIR) -+ dlg = wx.FileDialog(self,_("Archive all user data into file ..."),style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT | wx.FD_CHANGE_DIR) - dlg.SetDirectory(userDocsDir) - dlg.SetFilename(archivename) - dlg.SetWildcard("TAR archive (*.tar)|*.tar") ---- a/FirstStart/MySQL_Setup.py -+++ b/FirstStart/MySQL_Setup.py -@@ -533,7 +533,7 @@ - - if __name__ == "__main__": - app = wx.PySimpleApp(0) -- wx.InitAllImageHandlers() -+ # no-op in wxPython2.8 and later: wx.InitAllImageHandlers() - MySQL_Setup = MySQL_Setup_Main(None, -1, "") - app.SetTopWindow(MySQL_Setup) - MySQL_Setup.Show() ---- a/StyleEditor/FormatEditor.py -+++ b/StyleEditor/FormatEditor.py -@@ -33,7 +33,7 @@ - - class FormatEditor(wx.Dialog): - def __init__(self, *args, **kwds): -- #kwds["style"] = wx.TAB_TRAVERSAL | wx.CAPTION | wx.MINIMIZE_BOX | wx.MAXIMIZE_BOX | wx.THICK_FRAME -+ #kwds["style"] = wx.TAB_TRAVERSAL | wx.CAPTION | wx.MINIMIZE_BOX | wx.MAXIMIZE_BOX | wx.RESIZE_BORDER - kwds["style"] = wx.DEFAULT_FRAME_STYLE - self.filename = kwds['filename'] - del kwds['filename'] -@@ -130,7 +130,7 @@ - wx.MessageBox(_("The style name is not correct, please avoid: '/' under linux; '\\' and ':' under Windows"),_("Style name"),style=wx.OK|wx.ICON_ERROR) - - # def SaveAs(self,evt): --# self.filename = wx.FileSelector(_('Where to save the style file?'), flags = wx.SAVE | wx.OVERWRITE_PROMPT) -+# self.filename = wx.FileSelector(_('Where to save the style file?'), flags = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT) - # #print "%r"%self.filename - # if self.filename: - # self.Save(evt)