Commit 1fcc12ff authored by Andrew Lewman's avatar Andrew Lewman
Browse files

Reworked dist-rpm in order to duplicate what dist used to do, but don't actually require dist. 


svn:r6437
parent f1dad00b

Makefile.am

+6 −2
Changes for Makefile.am: 6 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -23,13 +23,17 @@ dist-rpm: 
	for subdir in BUILD RPMS SOURCES SPECS SRPMS; do        \

	    mkdir $$RPM_BUILD_DIR/$$subdir;                     \

	done;                                                   \

	tar zcf tor-$(VERSION).tar.gz ../tor;			\

	cp tor-$(VERSION).tar.gz $$RPM_BUILD_DIR/SOURCES;    	\

	mkdir $$RPM_BUILD_DIR/SOURCES/tor-$(VERSION);           \

        cp -R ./ $$RPM_BUILD_DIR/SOURCES/tor-$(VERSION)/;       \

        pushd $$RPM_BUILD_DIR/SOURCES/;                         \

        tar zcf tor-$(VERSION).tar.gz ./;                       \

        popd;                                                   \

        rpmbuild -ba --define "_topdir $$RPM_BUILD_DIR" tor.spec; \

        mv $$RPM_BUILD_DIR/SRPMS/* .;                           \

        mv $$RPM_BUILD_DIR/RPMS/* .;                            \

        rm -rf $$RPM_BUILD_DIR





dist-osx:

	@if [ "x$(prefix)" != 'x/Library/Tor' ]; then \

	  echo "Configure with --prefix=/Library/Tor, please"; \

tor.spec.in

+1 −2
Changes for tor.spec.in: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -163,8 +163,7 @@ strength of the anonymity provided. Tor is not presently suitable 
for high-stakes anonymity.



%prep

#%setup -q -n %{name}-%{native_version}

%setup -q -n %{name}

%setup -q -n %{name}-%{native_version}



%build

%configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup} \