Bug 1017204
| Summary: | calibre: mathjax is bundled | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | [Fedora] Fedora | Reporter: | Zbigniew Jędrzejewski-Szmek <zbyszek> | ||||||||||
| Component: | calibre | Assignee: | Zbigniew Jędrzejewski-Szmek <zbyszek> | ||||||||||
| Status: | CLOSED ERRATA | QA Contact: | Fedora Extras Quality Assurance <extras-qa> | ||||||||||
| Severity: | unspecified | Docs Contact: | |||||||||||
| Priority: | unspecified | ||||||||||||
| Version: | 20 | CC: | chkr, kevin, mbacovsk, nushio, sysoutfran | ||||||||||
| Target Milestone: | --- | ||||||||||||
| Target Release: | --- | ||||||||||||
| Hardware: | Unspecified | ||||||||||||
| OS: | Unspecified | ||||||||||||
| Whiteboard: | |||||||||||||
| Fixed In Version: | calibre-1.9.0-4.fc20 | Doc Type: | Bug Fix | ||||||||||
| Doc Text: | Story Points: | --- | |||||||||||
| Clone Of: | Environment: | ||||||||||||
| Last Closed: | 2013-11-13 02:09:04 UTC | Type: | Bug | ||||||||||
| Regression: | --- | Mount Type: | --- | ||||||||||
| Documentation: | --- | CRM: | |||||||||||
| Verified Versions: | Category: | --- | |||||||||||
| oVirt Team: | --- | RHEL 7.3 requirements from Atomic Host: | |||||||||||
| Cloudforms Team: | --- | Target Upstream Version: | |||||||||||
| Embargoed: | |||||||||||||
| Bug Depends On: | 1016677 | ||||||||||||
| Bug Blocks: | |||||||||||||
| Attachments: |
|
||||||||||||
|
Description
Zbigniew Jędrzejewski-Szmek
2013-10-09 12:40:04 UTC
This looks ok to me from a quick glance. I'm happy to try it and adjust as needed to keep things working. Thanks for working on this. ;) Please let us know when the package is available and ready and we can adjust calibre to use it. mathjax is now a package: https://admin.fedoraproject.org/updates/mathjax-2.2-3.fc20 Excellent. So, would you care to try unbundling this in rawhide at least? Or perhaps one of my co-maintainers would be willing to give it a try. Should be just removing all those files in prep and then linking them to the system versions/adding requires. So, I prepared some patches, also fixing some small issues I found: 1. cleanup: remove deprecated invocations and simplify things a bit, cleanup whitespace 2. unbundle mathjax 3. fix exception on shutdown 4. install bash completion script in /usr/share, and install zsh completion script I tested this lightly, http://manual.calibre-ebook.com/_static/mathjax.epub at least displays properly. Created attachment 819325 [details]
cleanup patch
Created attachment 819326 [details]
unbundle mathjax patch
Created attachment 819327 [details]
install shell completion scripts nicely
Created attachment 819328 [details]
fix exception on shutdown
Cool. I can look at this in the next few days... or if you like I'd be happy to grant you acls and you could push it to rawhide. ;) I applied for commit privileges for F20 and rawhide. Approved them. Thanks very much for working on this... it's appreciated. ;) (In reply to Kevin Fenzi from comment #11) > Approved them. Thanks very much for working on this... it's appreciated. ;) Ooops, I pushed the changes to F20 git before I noticed that it was still at the old version. Do you want to keep the update or should I revert the version change? I'm ok to update f20 too. I am getting this on upgrades this morning though: Transaction check error: file /usr/share/calibre/viewer/mathjax from install of calibre-1.9.0-3.fc21.x86_64 conflicts with file from package calibre-1.9.0-1.fc21.x86_64 I guess it's the old rpm can't handle directory moving to a symlink? ;( calibre-1.9.0-4.fc20 has been submitted as an update for Fedora 20. https://admin.fedoraproject.org/updates/calibre-1.9.0-4.fc20 Package calibre-1.9.0-4.fc20: * should fix your issue, * was pushed to the Fedora 20 testing repository, * should be available at your local mirror within two days. Update it with: # su -c 'yum update --enablerepo=updates-testing calibre-1.9.0-4.fc20' as soon as you are able to. Please go to the following url: https://admin.fedoraproject.org/updates/FEDORA-2013-20864/calibre-1.9.0-4.fc20 then log in and leave karma (feedback). calibre-1.9.0-4.fc20 has been pushed to the Fedora 20 stable repository. If problems still persist, please make note of it in this bug report. |