Bug 1427454 - Refresh RPM package data. r=froydnj

Bug 1024110 changed the WM class, and bug 1333826 removed the SDK and
the createdevel and related variables.

--HG--
extra : rebase_source : 599ab1998a5d6d471ab7928d782dde1c79ad4734
This commit is contained in:
Mike Hommey 2017-12-31 10:29:12 +09:00
parent 6994b7e8fd
commit 8aafa10c21
3 changed files with 2 additions and 19 deletions

View File

@ -12,7 +12,7 @@ Exec=@MOZ_APP_NAME@
Icon=@MOZ_APP_NAME@
Terminal=false
Type=Application
StartupWMClass=@MOZ_APP_NAME@-bin
StartupWMClass=@MOZ_APP_REMOTINGNAME@
MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
StartupNotify=true
X-MultipleArgs=false

View File

@ -31,15 +31,6 @@ BuildRequires: desktop-file-utils
#files were generated. Like the tests subpackage, we
#probably only need to conditionaly define the %files
#section.
%if %{?createdevel:1}
%package devel
Summary: %{pr_name} SDK
Group: Development/Libraries
requires: %{name} = %{version}-%{release}
%description devel
%{pr_name} SDK libraries, headers and interface descriptions
%endif
%if %{?createtests:1}
%package tests
Summary: %{pr_name} tests
@ -115,15 +106,6 @@ fi
%doc
%if %{?createdevel:1}
%files devel
%defattr(-,root,root,-)
%{_includedir}
%{_sdkdir}
%{_idldir}
%endif
%if %{?createtests:1}
%files tests
%{_datadir}/%{_testsinstalldir}/tests/

View File

@ -152,6 +152,7 @@ ifeq ($(MOZ_PKG_FORMAT),RPM)
$(PYTHON) -m mozbuild.action.preprocessor \
-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
-DMOZ_APP_DISPLAYNAME='$(MOZ_APP_DISPLAYNAME)' \
-DMOZ_APP_REMOTINGNAME='$(MOZ_APP_REMOTINGNAME)' \
$(RPM_INCIDENTALS)/mozilla.desktop \
-o $(RPMBUILD_SOURCEDIR)/$(MOZ_APP_NAME).desktop && \
rm -rf $(ABS_DIST)/$(TARGET_CPU) && \