[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r1564: Add vidalia.spec to our configure.in, so the RPM spec file s (in trunk: . pkg/rpm)
Author: edmanm
Date: 2006-12-26 02:07:43 -0500 (Tue, 26 Dec 2006)
New Revision: 1564
Added:
trunk/pkg/rpm/vidalia.spec.in
Removed:
trunk/pkg/rpm/vidalia.spec
Modified:
trunk/configure.in
Log:
Add vidalia.spec to our configure.in, so the RPM spec file stays current. Also
tweak a bit of wording in the spec file. I hope Oliver will let me know if I
fudged things up.
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2006-12-26 06:06:04 UTC (rev 1563)
+++ trunk/configure.in 2006-12-26 07:07:43 UTC (rev 1564)
@@ -151,8 +151,10 @@
AC_SUBST(VERSION, AC_PACKAGE_VERSION)
DOCS="doc"
OSXPKG="pkg/osx"
+RPMPKG="pkg/rpm"
AC_OUTPUT([$DOCS/vidalia.1 \
$DOCS/Doxyfile \
+ $RPMPKG/vidalia.spec \
$OSXPKG/builddmg.sh \
$OSXPKG/buildmpkg.sh \
$OSXPKG/VidaliaBundleDesc.plist \
Deleted: trunk/pkg/rpm/vidalia.spec
===================================================================
--- trunk/pkg/rpm/vidalia.spec 2006-12-26 06:06:04 UTC (rev 1563)
+++ trunk/pkg/rpm/vidalia.spec 2006-12-26 07:07:43 UTC (rev 1564)
@@ -1,86 +0,0 @@
-# $Id$
-#
-
-#%package vidalia
-Name : vidalia
-Version : 0.0.8
-Release : 3
-#
-License : GPL
-Summary : The Tor-Gui for Linux
-Group : Applications/Internet
-
-URL : http://www.vidalia-project.net
-Vendor : Matt Edman, Justin Hipple
-Packager : Oliver Niesner <digi_news@xxxxxx>
-
-Source0 : %{name}-%{version}.tar.gz
-
-#AutoReq : No
-#AutoProv : No
-
-Requires : tor >= 0.1.1.15
-BuildRequires : qt4
-#BuildRoot : /var/tmp/%{name}-buildroot
-
-%description
-
-Vidalia is an easy to use Tor-Controller Gui
-
-%prep
-rm -rf %{buildroot}
-
-#######################################################################
-# setup macro
-# -a num : Only unpack source number after changing to the directory
-# -b num : Only unpack source number before changing to the directory
-# -c : Create directory before unpacking.
-# -D : Do not delete the directory before unpacking
-# -n name : Name the directory as name
-# -q : Run quiety with minimum output
-# -T : Disable the automatic unpacking of the archives.
-#######################################################################
-%setup
-%build
-./configure
-make
-#########################################################
-# Common Red Hat RPM macros (rpm --showrc for more info)
-# {_sourcedir} : /usr/src/redhat/SOURCES
-# {_builddir} : /usr/src/redhat/BUILD
-# {_tmppath} : /var/tmp
-# {_libdir} : /usr/lib
-# {_bindir} : /usr/bin
-# {_datadir} : /usr/share
-# {_mandir} : /usr/share/man
-# {_docdir} : /usr/share/doc
-# {buildroot}
-# {name}
-# {version}
-# {release}
-#########################################################
-
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/local/bin
-mkdir -p $RPM_BUILD_ROOT/usr/local/man/man1
-#install -s -m 755 eject $RPM_BUILD_ROOT/usr/bin/eject
-#install -m 644 eject.1 $RPM_BUILD_ROOT/usr/man/man1/eject.1
-
-%makeinstall
-#%post
-
-%clean
-rm -rf %{buildroot}
-
-%files
-/usr/local/bin/vidalia
-/usr/local/man/man1/vidalia.1
-#####################################################
-# defattr sets the default attributes for all files
-#####################################################
-%defattr(-, root, root)
-
-%changelog
-* Tue Oct 11 2006 Oliver Niesner <digi_news@xxxxxx> 0.0.8-1
-- initial release
Copied: trunk/pkg/rpm/vidalia.spec.in (from rev 1563, trunk/pkg/rpm/vidalia.spec)
===================================================================
--- trunk/pkg/rpm/vidalia.spec.in (rev 0)
+++ trunk/pkg/rpm/vidalia.spec.in 2006-12-26 07:07:43 UTC (rev 1564)
@@ -0,0 +1,86 @@
+# $Id$
+#
+
+#%package vidalia
+Name : vidalia
+Version : @VERSION@
+Release : 3
+#
+License : GPL
+Summary : A Tor GUI for Linux
+Group : Applications/Internet
+
+URL : http://www.vidalia-project.net
+Vendor : Matt Edman, Justin Hipple
+Packager : Oliver Niesner <digi_news@xxxxxx>
+
+Source0 : %{name}-%{version}.tar.gz
+
+#AutoReq : No
+#AutoProv : No
+
+Requires : tor >= 0.1.1.15
+BuildRequires : qt4
+#BuildRoot : /var/tmp/%{name}-buildroot
+
+%description
+
+Vidalia is an easy-to-use Tor controller GUI
+
+%prep
+rm -rf %{buildroot}
+
+#######################################################################
+# setup macro
+# -a num : Only unpack source number after changing to the directory
+# -b num : Only unpack source number before changing to the directory
+# -c : Create directory before unpacking.
+# -D : Do not delete the directory before unpacking
+# -n name : Name the directory as name
+# -q : Run quiety with minimum output
+# -T : Disable the automatic unpacking of the archives.
+#######################################################################
+%setup
+%build
+./configure
+make
+#########################################################
+# Common Red Hat RPM macros (rpm --showrc for more info)
+# {_sourcedir} : /usr/src/redhat/SOURCES
+# {_builddir} : /usr/src/redhat/BUILD
+# {_tmppath} : /var/tmp
+# {_libdir} : /usr/lib
+# {_bindir} : /usr/bin
+# {_datadir} : /usr/share
+# {_mandir} : /usr/share/man
+# {_docdir} : /usr/share/doc
+# {buildroot}
+# {name}
+# {version}
+# {release}
+#########################################################
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/usr/local/bin
+mkdir -p $RPM_BUILD_ROOT/usr/local/man/man1
+#install -s -m 755 eject $RPM_BUILD_ROOT/usr/bin/eject
+#install -m 644 eject.1 $RPM_BUILD_ROOT/usr/man/man1/eject.1
+
+%makeinstall
+#%post
+
+%clean
+rm -rf %{buildroot}
+
+%files
+/usr/local/bin/vidalia
+/usr/local/man/man1/vidalia.1
+#####################################################
+# defattr sets the default attributes for all files
+#####################################################
+%defattr(-, root, root)
+
+%changelog
+* Tue Oct 11 2006 Oliver Niesner <digi_news@xxxxxx> 0.0.8-1
+- initial release