rpms/scribus
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove --vendor from desktop-file-install for F19+ https://fedorahosted.org/fesco/ticket/1077

Browse source
This commit is contained in:
Toshio Kuratomi 2013-02-25 17:30:49 -08:00
commit 8fd8b52ffd
2 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
scribus-1.4.2-nonfree.patch
View file

@ -1,6 +1,7 @@
diff -up scribus-1.4.2/scribus/CMakeLists.txt.nonfree scribus-1.4.2/scribus/CMakeLists.txt
--- scribus-1.4.2/scribus/CMakeLists.txt.nonfree 2012-06-07 22:01:10.000000000 +0200
+++ scribus-1.4.2/scribus/CMakeLists.txt 2013-01-15 18:50:11.000000000 +0100
Index: scribus-1.4.2/scribus/CMakeLists.txt
===================================================================
--- scribus-1.4.2.orig/scribus/CMakeLists.txt
+++ scribus-1.4.2/scribus/CMakeLists.txt
@@ -2,7 +2,6 @@ IF(WIN32)
ADD_DEFINITIONS(-DQT_DLL)
ENDIF(WIN32)
@ -9,9 +10,10 @@ diff -up scribus-1.4.2/scribus/CMakeLists.txt.nonfree scribus-1.4.2/scribus/CMak
ADD_SUBDIRECTORY(dtd)
ADD_SUBDIRECTORY(manpages)
ADD_SUBDIRECTORY(colormgmt)
diff -up scribus-1.4.2/scribus/helpbrowser.cpp.nonfree scribus-1.4.2/scribus/helpbrowser.cpp
--- scribus-1.4.2/scribus/helpbrowser.cpp.nonfree 2012-06-24 22:43:17.000000000 +0200
+++ scribus-1.4.2/scribus/helpbrowser.cpp 2013-01-15 18:50:11.000000000 +0100
Index: scribus-1.4.2/scribus/helpbrowser.cpp
===================================================================
--- scribus-1.4.2.orig/scribus/helpbrowser.cpp
+++ scribus-1.4.2/scribus/helpbrowser.cpp
@@ -716,7 +716,7 @@ QString HelpBrowser::historyFile()
void HelpBrowser::displayNoHelp()
@ -21,9 +23,10 @@ diff -up scribus-1.4.2/scribus/helpbrowser.cpp.nonfree scribus-1.4.2/scribus/hel
"HTML message for no documentation available to show");
textBrowser->setText(noHelpMsg);
diff -up scribus-1.4.2/scribus/profiles/CMakeLists.txt.nonfree scribus-1.4.2/scribus/profiles/CMakeLists.txt
--- scribus-1.4.2/scribus/profiles/CMakeLists.txt.nonfree 2012-01-03 22:47:01.000000000 +0100
+++ scribus-1.4.2/scribus/profiles/CMakeLists.txt 2013-01-15 18:50:11.000000000 +0100
Index: scribus-1.4.2/scribus/profiles/CMakeLists.txt
===================================================================
--- scribus-1.4.2.orig/scribus/profiles/CMakeLists.txt
+++ scribus-1.4.2/scribus/profiles/CMakeLists.txt
@@ -6,7 +6,5 @@ INSTALL(FILES
GenericCMYK.icm
GenericCMYK.txt

12
scribus.spec
View file

@ -1,6 +1,6 @@
Name: scribus
Version: 1.4.2
Release: 4%{?dist}
Release: 5%{?dist}
Summary: DeskTop Publishing application written in Qt
@ -111,7 +111,10 @@ find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
# install the global desktop file
rm -f ${RPM_BUILD_ROOT}%{_datadir}/mimelnk/application/*scribus.desktop
desktop-file-install --vendor="fedora" \
desktop-file-install \
%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
--vendor="fedora" \
%endif
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
scribus.desktop
@ -133,7 +136,7 @@ update-desktop-database &> /dev/null || :
%doc AUTHORS ChangeLog COPYING LINKS README
%{_bindir}/%{name}
%{_libdir}/%{name}/
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/pixmaps/*
%{_datadir}/%{name}/
@ -145,6 +148,9 @@ update-desktop-database &> /dev/null || :
%changelog
* Mon Feb 25 2013 Toshio Kuratomi <toshio@fedoraproject.org> - 1.4.2-5
- Remove --vendor from desktop-file-install for F19+ https://fedorahosted.org/fesco/ticket/1077
* Wed Jan 30 2013 Dan Horák <dan[at]danny.cz> - 1.4.2-4
- update for Pillow (#896301)