diff --git a/README b/README index be13992..a136cc5 100644 --- a/README +++ b/README @@ -4,9 +4,3 @@ gPodder 4 for Sailfish OS This repository contains the platform-specific customizations and packaging for running gPodder 4 on Sailfish OS. Python 3.3.3 and PyOtherSide is already included in the device repositories starting with Sailfish OS 1.0.3.8. - -To build, make sure you have make and rpm installed, then: - - make -f dist.mk - -This should give you an installable .rpm file in the current directory. diff --git a/dist.mk b/dist.mk deleted file mode 100644 index 983beed..0000000 --- a/dist.mk +++ /dev/null @@ -1,42 +0,0 @@ -# Make distribution RPM -# Thomas Perl -# Required packages (build-dependencies): rpm - -SPECSRC := rpm/harbour-org.gpodder.sailfish.spec - -RPMBUILD_ROOT := ~/rpmbuild -NAME := $(shell rpmspec --query --queryformat='%{name}' $(SPECSRC)) -VERSION := $(shell rpmspec --query --queryformat='%{version}' $(SPECSRC)) -RELEASE := $(shell rpmspec --query --queryformat='%{release}' $(SPECSRC)) -SOURCES := README gpodder-core podcastparser gpodder-ui-qml qml -RPMSRC := $(wildcard rpm/*.png rpm/*.desktop) - -TARNAME := $(NAME)-$(VERSION).tar.gz -SPECNAME := $(NAME)-$(VERSION).spec -RPMNAME := $(NAME)-$(VERSION)-$(RELEASE).noarch.rpm - -all: rpm - -rpm: $(SPECNAME) $(TARNAME) - mkdir -p $(RPMBUILD_ROOT)/SOURCES - cp $(RPMSRC) $(TARNAME) $(RPMBUILD_ROOT)/SOURCES/ - rpmbuild -bb --clean $(SPECNAME) - cp $(RPMBUILD_ROOT)/RPMS/noarch/$(RPMNAME) . - -$(TARNAME): - rm -rf tmp - mkdir -p tmp/$(NAME)-$(VERSION) - cp -rpv $(SOURCES) tmp/$(NAME)-$(VERSION)/ - tar -C tmp -czvf $@ $(NAME)-$(VERSION) - -$(SPECNAME): rpm/$(NAME).spec - cp $< $@ - -clean: - rm -rf $(SPECNAME) $(TARNAME) tmp - -distclean: clean - rm -f $(RPMNAME) - -.DEFAULT: all -.PHONY: all rpm clean distclean diff --git a/rpm/harbour-org.gpodder.sailfish.desktop b/harbour-org.gpodder.sailfish.desktop similarity index 100% rename from rpm/harbour-org.gpodder.sailfish.desktop rename to harbour-org.gpodder.sailfish.desktop diff --git a/rpm/harbour-org.gpodder.sailfish.png b/harbour-org.gpodder.sailfish.png similarity index 100% rename from rpm/harbour-org.gpodder.sailfish.png rename to harbour-org.gpodder.sailfish.png diff --git a/rpm/harbour-org.gpodder.sailfish.spec b/rpm/harbour-org.gpodder.sailfish.spec index b26167d..3912902 100644 --- a/rpm/harbour-org.gpodder.sailfish.spec +++ b/rpm/harbour-org.gpodder.sailfish.spec @@ -5,9 +5,7 @@ Summary: Media and podcast aggregator Name: harbour-org.gpodder.sailfish Version: 4.3.0 Release: 1 -Source0: %{name}-%{version}.tar.gz -Source1: %{name}.desktop -Source2: %{name}.png +Source: %{name}-%{version}.tar.gz BuildArch: noarch URL: http://gpodder.org/ License: ISC / GPLv3 @@ -37,11 +35,11 @@ cp -rpv gpodder-ui-qml/common $TARGET/qml/ TARGET=%{buildroot}/%{_datadir}/applications mkdir -p $TARGET -cp -rpv %{SOURCE1} $TARGET/ +cp -rpv %{name}.desktop $TARGET/ TARGET=%{buildroot}/%{_datadir}/icons/hicolor/86x86/apps/ mkdir -p $TARGET -cp -rpv %{SOURCE2} $TARGET/ +cp -rpv %{name}.png $TARGET/ %files %defattr(-,root,root,-)