[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r3954: Backport cassmodiah's RPM specfile to 0.1.x. (vidalia/branches/vidalia-0.1/pkg/rpm)
Author: edmanm
Date: 2009-07-09 14:58:29 -0400 (Thu, 09 Jul 2009)
New Revision: 3954
Modified:
vidalia/branches/vidalia-0.1/pkg/rpm/vidalia.spec.in
Log:
Backport cassmodiah's RPM specfile to 0.1.x.
Modified: vidalia/branches/vidalia-0.1/pkg/rpm/vidalia.spec.in
===================================================================
--- vidalia/branches/vidalia-0.1/pkg/rpm/vidalia.spec.in 2009-07-09 18:38:45 UTC (rev 3953)
+++ vidalia/branches/vidalia-0.1/pkg/rpm/vidalia.spec.in 2009-07-09 18:58:29 UTC (rev 3954)
@@ -1,136 +1,144 @@
-##
-## $Id$
-##
-## This file is part of Vidalia, and is subject to the license terms in the
-## LICENSE file, found in the top level directory of this distribution. If
-## you did not receive the LICENSE file with this file, you may obtain it
-## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
-##
+Name: vidalia
+Version: @VERSION@
+Release: 2%{?dist}
+Summary: GUI controller for the Tor Onion Routing Network
-#%package vidalia
-Name : vidalia
-Version : @VERSION@
-Release : 1
-#
-License : GPL
-Summary : A Tor GUI for Linux
-Group : Applications/Internet
+Group: Applications/Internet
+License: GPLv2+
+URL: https://www.torproject.org/vidalia/
+Source0: https://www.torproject.org/%{name}/dist/%{name}-%{version}.tar.gz
+Source1: %{name}.desktop
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-URL : http://www.vidalia-project.net
-Vendor : Matt Edman, Justin Hipple
-Packager : Oliver Niesner <digi_news@xxxxxx>
+BuildRequires: desktop-file-utils
+BuildRequires: openssl-devel
+BuildRequires: qt4-devel
+BuildRequires: cmake
-Source0 : %{name}-%{version}.tar.gz
+Requires: tor
+Requires: privoxy
+Requires: hicolor-icon-theme
-#AutoReq : No
-#AutoProv : No
-Requires : tor >= 0.1.2.18
-BuildRequires : qt4 >= 4.2
-BuildRequires : cmake >= 2.4
-#BuildRoot : /var/tmp/%{name}-buildroot
-
%description
+Vidalia is a cross-platform controller GUI for Tor, built using the Qt
+framework. Vidalia allows you to start and stop Tor, view the status of Tor at
+a glance, and monitor Tor's bandwidth usage. Vidalia also makes it easy to
+contribute to the Tor network by helping you setup a Tor server, if you wish.
-Vidalia is an easy-to-use Tor controller GUI
+%package doc
+Summary: Documentation for %{name}
+Group: Documentation
+BuildRequires: doxygen
+Requires: %{name} = %{version}-%{release}
+
+
+%description doc
+Doxygen generated documentations for %{name}.
+
+
%prep
-rm -rf %{buildroot}
+%setup -q
-#######################################################################
-# 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
-cmake . && make
+%build
+%if 0%{?_qt4_bindir:1}
+PATH=%{_qt4_bindir}:$PATH; export PATH
+%else
+PATH=%{_libdir}/qt4/bin:$PATH; export PATH
+%endif
+%cmake .
+make %{?_smp_mflags}
-#########################################################
-# 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}
-#########################################################
+cd doc
+doxygen Doxyfile.in
+
%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/local/bin
-mkdir -p $RPM_BUILD_ROOT/usr/local/share/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
+rm -rf %{buildroot}
-%makeinstall
-#%post
+make install \
+ INSTALL="install -p" \
+ DESTDIR=%{buildroot}
-%clean
-rm -rf %{buildroot}
+rm -rf %{buildroot}%{_datadir}/applications/%{name}.desktop
-%files
-/usr/local/bin/vidalia
-/usr/local/share/man/man1/vidalia.1
+install -Dpm0644 doc/%{name}.1 \
+ %{buildroot}%{_mandir}/man1/%{name}.1
-#####################################################
-# defattr sets the default attributes for all files
-#####################################################
-%defattr(-, root, root)
+desktop-file-install \
+ %if 0%{?rhel}
+ --vendor="" \
+ %endif
+ --dir %{buildroot}%{_datadir}/applications \
+ %{SOURCE1}
-%changelog
-* Wed Jul 30 2008 Oliver Niesner <digi_news@xxxxxx> 0.1.6-1
-- bump to 0.1.6
-- fix man path
+mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}-doxygen/
+install -Dpm0644 doc/html/* \
+ %{buildroot}%{_docdir}/%{name}-%{version}-doxygen/
-* Mon Mar 31 2008 Oliver Niesner <digi_news@xxxxxx> 0.1.2-1
-- bump to 0.1.2
-* Tue Mar 04 2008 Oliver Niesner <digi_news@xxxxxx> 0.1.0-1
-- bump to 0.1.0 and modifications to meet cmake requirements!
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-* Mon Nov 26 2007 Oliver Niesner <digi_news@xxxxxx> 0.0.16-1
-- bump to 0.0.16
-* Thu Oct 29 2007 Oliver Niesner <digi_news@xxxxxx> 0.0.15-1
-- bump to 0.0.15
+%postun
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
-* Thu Aug 30 2007 Oliver Niesner <digi_news@xxxxxx> 0.0.14-1
-- bump to 0.0.14
-* Thu Aug 07 2007 Oliver Niesner <digi_news@xxxxxx> 0.0.13-1
-- bump to 0.0.13
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-* Thu Jun 05 2007 Oliver Niesner <digi_news@xxxxxx> 0.0.12-1
-- bump to 0.0.12
-* Thu Feb 08 2007 Oliver Niesner <digi_news@xxxxxx> 0.0.11-1
-- bump to 0.0.11 release
+%clean
+rm -rf %{buildroot}
-* Mon Jan 08 2007 Oliver Niesner <digi_news@xxxxxx> 0.0.10-1
-- bump to 0.0.10 release
-* Mon Nov 06 2006 Oliver Niesner <digi_news@xxxxxx> 0.0.9-1
-- first release build for 0.0.9
+%files
+%defattr(-,root,root,-)
+%doc CHANGELOG CREDITS HACKING LICENSE LICENSE-GPLV2 LICENSE-GPLV3 LICENSE-OPENSSL README
+%{_bindir}/%{name}
+%{_mandir}/man1/%{name}*
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
-* Tue Oct 11 2006 Oliver Niesner <digi_news@xxxxxx> 0.0.8-1
-- initial release
+
+%files doc
+%defattr(-,root,root,-)
+%{_docdir}/%{name}-%{version}-doxygen/
+
+
+%changelog
+* Sat Jun 13 2009 Matt Edman <edmanm@xxxxxxxxxxxxxxxxxxx> - 0.2.1-1
+- Added to Vidalia Subversion repository
+
+* Mon Jun 01 2009 Simon Wesp <cassmodiah@xxxxxxxxxxxxxxxxx> - 0.1.13-2
+- Merge builds for fedora and epel
+
+* Mon Jun 01 2009 Simon Wesp <cassmodiah@xxxxxxxxxxxxxxxxx> - 0.1.13-1
+- Update to 0.1.13
+- Adjust to fedora and epel
+
+* Sun Apr 06 2009 Simon Wesp <cassmodiah@xxxxxxxxxxxxxxxxx> - 0.1.12-1
+- New upstream release
+- Correct typo in URL
+- Add R: hicolor for new handling of icons
+- Add update-icon-cache sniplet
+- Use summary of upstream for Desktopfile and in spec file
+- Create doxygen-documentations
+
+* Sun Feb 15 2009 Simon Wesp <cassmodiah@xxxxxxxxxxxxxxxxx> - 0.1.10-2
+- Correct Qt in Summary
+- Correct Qt in desktop-file-source
+- Add a german Translation in the desktop-file-source
+- Using CMAKE-macro instead of cmake
+- Add more files to more documentation
+
+* Tue Feb 10 2009 Simon Wesp <cassmodiah@xxxxxxxxxxxxxxxxx> - 0.1.10-1
+- Initial Package build
Property changes on: vidalia/branches/vidalia-0.1/pkg/rpm/vidalia.spec.in
___________________________________________________________________
Added: svn:mergeinfo
+ /vidalia/trunk/cmake/pkg/rpm/vidalia.spec.in:3745
/vidalia/trunk/pkg/rpm/vidalia.spec.in:3235,3482,3504-3505,3516-3517,3519-3520,3522,3524-3526,3528,3530,3643,3732,3740,3745,3754,3844,3951