openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package vidalia

--- vidalia.spec.orig
+++ vidalia.spec
@@ -1,52 +1,55 @@
-#
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-
-# norootforbuild
 Name:           vidalia
-Version:        0.1.15
+Summary:        Controller GUI for Tor
+Version:        0.2.8
 Release:        1
-License:        GPL
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        %name-%{version}.tar.gz
-Patch0:         desktop-icon.patch
-URL:            http://www.vidalia-project.net
+URL:            http://www.torproject.org/vidalia/
+License:        GPLv2+
+Source0:        http://www.torproject.org/vidalia/dist/%{name}-%{version}.tar.gz
+Patch0:         %{name}-desktop.patch
 Group:          Productivity/Networking/Security
-BuildRequires:  libqt4-devel libqt4 update-desktop-files
-BuildRequires:  libstdc++-devel gcc-c++ libpng libpng-devel freetype2-devel cmake
-Summary:        Controller GUI for Tor
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  gcc-c++
+BuildRequires:  libqt4-devel
+BuildRequires:  libpng-devel
+BuildRequires:  freetype2-devel
+BuildRequires:  cmake
+BuildRequires:  update-desktop-files
+Requires:       tor
+Recommends:     polipo
 
 %description
-Vidalia is a cross-platform controller GUI for Tor, built using the Qt framework. Vidalia runs on any platform supported by Qt 4.1, including Windows, Mac OS X, and Linux or other Unix variants using the X11 window system.
-
-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 a cross-platform controller GUI for Tor, built using the Qt framework.
+Vidalia runs on any platform supported by Qt 4.1, including Windows, Mac OS X,
+and Linux or other Unix variants using the X11 window system.
+
+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. 
 
 %prep
-
 %setup -q
-%patch0 -p1
-#%patch1 -p1
+%patch0
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
-cmake ./ \
-			-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-			-DCMAKE_BUILD_TYPE=release
-make %{?jobs:-j%jobs}
+cmake . \
+  -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+  -DCMAKE_BUILD_TYPE=release
+make %{?_smp_mflags} VERBOSE=1
 
 %install
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
-cp debian/vidalia.xpm $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
-%makeinstall
-%suse_update_desktop_file -r %name Utility Security
+%make_install
+%if 0%{?suse_version}
+%suse_update_desktop_file %{name}
+%endif
 
 %clean
 rm -rf "$RPM_BUILD_ROOT"
 
 %files
 %defattr(-,root,root)
+%doc CHANGELOG CREDITS HACKING LICENSE* README
 %if 0%{?suse_version}
 %dir %{_datadir}/icons/hicolor
 %dir %{_datadir}/icons/hicolor/128x128
@@ -64,7 +67,6 @@ rm -rf "$RPM_BUILD_ROOT"
 %endif
 %{_bindir}/vidalia
 %{_datadir}/applications/vidalia.desktop
-%{_datadir}/pixmaps/vidalia.xpm
 %{_datadir}/icons/hicolor/128x128/apps/vidalia.png
 %{_datadir}/icons/hicolor/16x16/apps/vidalia.png
 %{_datadir}/icons/hicolor/22x22/apps/vidalia.png
@@ -73,9 +75,3 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_datadir}/icons/hicolor/64x64/apps/vidalia.png
 
 %changelog
-* Tue Oct 13 2009 - freespacer@gmx.de
-- update to version 0.1.15
-* Fri Mar 13 2009 - mstopka@opensuse.org
-- desktop-icon patch added
-* Fri Mar 06 2009 - mstopka@opensuse.org
-- initial version

Places

File project.diff of Package vidalia

Places