rpms/canorus/devel canorus-destdir.patch, NONE, 1.1 canorus-python-dir.patch, NONE, 1.1 canorus-remove-extra-doc.patch, NONE, 1.1 canorus-system-fonts.patch, NONE, 1.1 canorus.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Orcan Ogetbil
oget at fedoraproject.org
Tue Sep 22 18:10:39 UTC 2009
- Previous message (by thread): rpms/dracut/devel .cvsignore, 1.15, 1.16 dracut.spec, 1.30, 1.31 sources, 1.16, 1.17
- Next message (by thread): rpms/canorus/F-11 canorus-destdir.patch, NONE, 1.1 canorus-python-dir.patch, NONE, 1.1 canorus-remove-extra-doc.patch, NONE, 1.1 canorus-system-fonts.patch, NONE, 1.1 canorus.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: oget
Update of /cvs/pkgs/rpms/canorus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15306/devel
Modified Files:
.cvsignore sources
Added Files:
canorus-destdir.patch canorus-python-dir.patch
canorus-remove-extra-doc.patch canorus-system-fonts.patch
canorus.spec import.log
Log Message:
* Fri Sep 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-4.R1177.20090904svn
- SVN revision 1177 (how come is this different from the last snapshot?)
- Fix compilation flags
* Mon Jul 13 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-3.R1177.20090804svn
- SVN revision 1177
- Make package Fedora 10 friendly
- Fix release tag
- Fix license tag
- Add .desktop file categories and mime type
- Remove content with unknown or bad licenses
* Fri Jul 10 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-2.R1163
- Minor cleanup in %%install section
* Thu Jul 09 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-1.R1163
- Initial build
canorus-destdir.patch:
CMakeLists.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE canorus-destdir.patch ---
diff -rupN canorus-0.7svn.R1163.old/src/CMakeLists.txt canorus-0.7svn.R1163/src/CMakeLists.txt
--- canorus-0.7svn.R1163.old/src/CMakeLists.txt 2009-07-09 18:45:48.000000000 -0400
+++ canorus-0.7svn.R1163/src/CMakeLists.txt 2009-07-10 02:48:19.000000000 -0400
@@ -680,10 +680,10 @@ INSTALL(FILES ${Canorus_Translation_Bins
# Install fonts
INSTALL(FILES ${Canorus_Fonts} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/fonts")
# Install users manual, if it exists
-INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc)")
-INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide)")
-FILE(GLOB Canorus_Usersguide RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ../doc/usersguide/*.qhc ../doc/usersguide/*.qch)
-INSTALL(FILES ${Canorus_Usersguide} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide")
+#INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc)")
+#INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide)")
+#FILE(GLOB Canorus_Usersguide RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ../doc/usersguide/*.qhc ../doc/usersguide/*.qch)
+#INSTALL(FILES ${Canorus_Usersguide} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide")
# Install examples
INSTALL( DIRECTORY ${Canorus_Examples} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}" )
canorus-python-dir.patch:
CMakeLists.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE canorus-python-dir.patch ---
--- canorus-0.7.R1002.old/src/CMakeLists.txt 2009-03-27 06:25:52.000000000 -0400
+++ canorus-0.7.R1002/src/CMakeLists.txt 2009-07-08 19:42:47.000000000 -0400
@@ -668,10 +668,10 @@ IF(USE_RUBY)
INSTALL(TARGETS ${SWIG_MODULE_CanorusRuby_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
ENDIF(USE_RUBY)
IF(USE_PYTHON)
- INSTALL(TARGETS ${SWIG_MODULE_CanorusPython_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_LIB_DIR})
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CanorusPython.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_LIB_DIR})
- INSTALL(TARGETS ${SWIG_MODULE_CanorusPython_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CanorusPython.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
+ INSTALL(TARGETS ${SWIG_MODULE_CanorusPython_REAL_NAME} LIBRARY DESTINATION ${CANORUS_PYTHON_LIB_DIR})
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CanorusPython.py DESTINATION ${CANORUS_PYTHON_LIB_DIR})
+ #INSTALL(TARGETS ${SWIG_MODULE_CanorusPython_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
+ #INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CanorusPython.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
ENDIF(USE_PYTHON)
# Install scripts
canorus-remove-extra-doc.patch:
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE canorus-remove-extra-doc.patch ---
diff -rupN canorus-0.7svn.R1174.old/CMakeLists.txt canorus-0.7svn.R1174/CMakeLists.txt
--- canorus-0.7svn.R1174.old/CMakeLists.txt 2009-07-27 00:23:11.000000000 -0400
+++ canorus-0.7svn.R1174/CMakeLists.txt 2009-07-27 02:52:10.000000000 -0400
@@ -90,5 +90,5 @@ ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(doc)
# Install README, VERSION, COPYING and other raw txt files
-INSTALL(FILES AUTHORS DEVELOPERS COPYING NEWS README VERSION DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}")
+#INSTALL(FILES AUTHORS DEVELOPERS COPYING NEWS README VERSION DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}")
canorus-system-fonts.patch:
canorus.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- NEW FILE canorus-system-fonts.patch ---
--- canorus-0.7.R1002.old/src/canorus.cpp 2009-03-27 06:25:52.000000000 -0400
+++ canorus-0.7.R1002/src/canorus.cpp 2009-07-08 16:43:52.000000000 -0400
@@ -189,12 +189,12 @@ void CACanorus::initUndo() {
void CACanorus::initFonts() {
// addApplicationFont doesn't understand prefix: paths.
- QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Roma.ttf").absoluteFilePath());
- QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Ital.ttf").absoluteFilePath());
- QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Bold.ttf").absoluteFilePath());
- QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-BoldItal.ttf").absoluteFilePath());
+ QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Roma.otf").absoluteFilePath());
+ QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Ital.otf").absoluteFilePath());
+ QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-Bold.otf").absoluteFilePath());
+ QFontDatabase::addApplicationFont(QFileInfo("fonts:CenturySchL-BoldItal.otf").absoluteFilePath());
QFontDatabase::addApplicationFont(QFileInfo("fonts:FreeSans.ttf").absoluteFilePath());
- QFontDatabase::addApplicationFont(QFileInfo("fonts:Emmentaler-14.ttf").absoluteFilePath());
+ QFontDatabase::addApplicationFont(QFileInfo("fonts:emmentaler-14.otf").absoluteFilePath());
// populate glyph->codepoint map using generated list
#include "fonts/fetaList.cxx"
}
--- NEW FILE canorus.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%global svnrev R1177
%global svndate .20090904svn
Name: canorus
Summary: Music Score Editor
Version: 0.7
Release: 4.%{svnrev}%{svndate}%{?dist}
Group: Applications/Editors
# rtmidi is MIT. It gets compiled into the final binary, which is GPLv2
# The rest of the source code, as explicitly indicated by upstream, is GPLv2
# The .can files are Public Domain
License: GPLv2 and Public Domain
URL: http://canorus.berlios.de/
# The original source tarball contains content files that have
# unknown and possibly nonfree licenses we remove those bits from the tarball.
# wget http://193.95.242.3/canorusNightly/source/canorus_0.7svn.R1177_source.tar.bz2
# tar jxf canorus_*.tar.bz2
# rm -fr canorus-*/examples/{midi,musicxml}
## This next one is non-commercial use only. So remove...
# rm -fr canorus-*/examples/come_again.can
# tar jcf canorus_0.7svn.R1177_source-FE.tar.bz2 canorus-*
Source0: canorus_%{version}svn.%{svnrev}_source-FE.tar.bz2
# The following patches are Fedora specific and not sent upstream:
# Remove duplicate copies of docs that are already going to %%doc
Patch0: %{name}-remove-extra-doc.patch
# Use system fonts instead of bundled ones
Patch1: %{name}-system-fonts.patch
# Correct python binding installation dir
Patch2: %{name}-python-dir.patch
# No need to create directories outside the buildroot
Patch3: %{name}-destdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: alsa-lib-devel
BuildRequires: cmake
BuildRequires: lyx
BuildRequires: qt-devel
BuildRequires: python-devel
BuildRequires: swig
# Ruby scripting not ready yet
#BuildRequires: ruby
#BuildRequires: ruby-devel
BuildRequires: tetex-tex4ht
BuildRequires: zlib-devel
%if 0%{?fedora} >= 11
Requires: font(centuryschoolbookl)
Requires: font(emmentaler)
Requires: font(freesans)
%else
Requires: freefont
Requires: lilypond-century-schoolbook-l-fonts
Requires: lilypond-emmentaler-fonts
%endif
Requires: hicolor-icon-theme
%description
Canorus is a free extensible music score editor. It supports note writing,
import/export of various file formats, MIDI input and output, scripting and
more! Using a Qt4 framework Canorus offers a fast and modern GUI and
cross-platformability.
%prep
%setup -q -n %{name}-%{version}svn.%{svnrev}
%patch0 -p1 -b .noextradocs
%patch1 -p1 -b .fonts
%patch2 -p1 -b .python
%patch3 -p1 -b .destdir
# Remove bundled copy of zlib
rm -fr src/zlib
# To apply Fedora's optflags properly
sed -i 's|-O0 -g||' src/CMakeLists.txt
# Correct the desktop file
sed -i '/^MimeType.*[^;]$/s/$/;/' %{name}.desktop
%build
%{cmake} -DCANORUS_PYTHON_LIB_DIR="%{python_sitearch}" .
make %{?_smp_mflags}
# Build usersguide
make %{?_smp_mflags} -C doc/usersguide qthelp
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
# Create the lang file. %%find_lang does not handle .qm files
echo %%dir %{_datadir}/%{name}/lang/ >> %{name}.lang
for file in %{buildroot}%{_datadir}/%{name}/lang/*.qm; do
language=$(basename $file|cut -f 2 -d _|sed 's|\..*||')
echo %%lang\($language\) %{_datadir}/%{name}/lang/$language.qm >> %{name}.lang
done
# Handle fonts
rm -f %{buildroot}%{_datadir}/%{name}/fonts/*.ttf
%if 0%{?fedora} >= 11
ln -s ../../fonts/gnu-free/FreeSans.ttf %{buildroot}%{_datadir}/%{name}/fonts/
%else
ln -s ../../fonts/freefont/FreeSans.ttf %{buildroot}%{_datadir}/%{name}/fonts/
%endif
ln -s ../../fonts/lilypond/emmentaler-14.otf %{buildroot}%{_datadir}/%{name}/fonts/
ln -s ../../fonts/lilypond/CenturySchL-Bold.otf %{buildroot}%{_datadir}/%{name}/fonts/
ln -s ../../fonts/lilypond/CenturySchL-BoldItal.otf %{buildroot}%{_datadir}/%{name}/fonts/
ln -s ../../fonts/lilypond/CenturySchL-Ital.otf %{buildroot}%{_datadir}/%{name}/fonts/
ln -s ../../fonts/lilypond/CenturySchL-Roma.otf %{buildroot}%{_datadir}/%{name}/fonts/
# Desktop file
desktop-file-install \
--dir=%{buildroot}%{_datadir}/applications/ \
--add-category=Midi \
--add-category=X-Notation \
--remove-category=Application \
--remove-key=Encoding \
--add-mime-type="application/xml" \
%{name}.desktop
# Menu image
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
cp -a src/ui/images/general/canorusmlsource.svg \
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
# Install usersguide
mkdir -p %{buildroot}%{_datadir}/%{name}/doc/usersguide/
cp -a doc/usersguide/*.{qch,qhc} %{buildroot}%{_datadir}/%{name}/doc/usersguide/
%clean
rm -rf %{buildroot}
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database &> /dev/null || :
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING DEVELOPERS NEWS README TODO
%doc %{_datadir}/%{name}/doc/
%{_bindir}/%{name}
%{python_sitearch}/*Canorus*
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/examples/
%{_datadir}/%{name}/fonts/
%{_datadir}/%{name}/images/
%{_datadir}/%{name}/plugins/
%{_datadir}/%{name}/scripts/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%changelog
* Fri Sep 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-4.R1177.20090904svn
- SVN revision 1177 (how come is this different from the last snapshot?)
- Fix compilation flags
* Mon Jul 13 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-3.R1177.20090804svn
- SVN revision 1177
- Make package Fedora 10 friendly
- Fix release tag
- Fix license tag
- Add .desktop file categories and mime type
- Remove content with unknown or bad licenses
* Fri Jul 10 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-2.R1163
- Minor cleanup in %%install section
* Thu Jul 09 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-1.R1163
- Initial build
--- NEW FILE import.log ---
canorus-0_7-4_R1177_20090904svn_fc11:HEAD:canorus-0.7-4.R1177.20090904svn.fc11.src.rpm:1253643011
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/canorus/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 22 Sep 2009 01:49:16 -0000 1.1
+++ .cvsignore 22 Sep 2009 18:10:38 -0000 1.2
@@ -0,0 +1 @@
+canorus_0.7svn.R1177_source-FE.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/canorus/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 22 Sep 2009 01:49:16 -0000 1.1
+++ sources 22 Sep 2009 18:10:38 -0000 1.2
@@ -0,0 +1 @@
+8d375719c70345a563aa8ca51a31920d canorus_0.7svn.R1177_source-FE.tar.bz2
- Previous message (by thread): rpms/dracut/devel .cvsignore, 1.15, 1.16 dracut.spec, 1.30, 1.31 sources, 1.16, 1.17
- Next message (by thread): rpms/canorus/F-11 canorus-destdir.patch, NONE, 1.1 canorus-python-dir.patch, NONE, 1.1 canorus-remove-extra-doc.patch, NONE, 1.1 canorus-system-fonts.patch, NONE, 1.1 canorus.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list