rpms/vidalia/F-13 .cvsignore, 1.6, 1.7 sources, 1.7, 1.8 vidalia.desktop, 1.2, 1.3 vidalia.spec, 1.11, 1.12
supercyper
supercyper at fedoraproject.org
Wed May 26 13:08:35 UTC 2010
- Previous message: rpms/vidalia/F-12 .cvsignore, 1.6, 1.7 sources, 1.7, 1.8 vidalia.desktop, 1.2, 1.3 vidalia.spec, 1.10, 1.11
- Next message: rpms/ekiga/devel ekiga.spec,1.89,1.90
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: supercyper
Update of /cvs/pkgs/rpms/vidalia/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11944
Modified Files:
.cvsignore sources vidalia.desktop vidalia.spec
Log Message:
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vidalia/F-13/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore 1 Feb 2010 07:43:44 -0000 1.6
+++ .cvsignore 26 May 2010 13:08:35 -0000 1.7
@@ -1 +1 @@
-vidalia-0.2.7.tar.gz
+vidalia-0.2.9.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vidalia/F-13/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources 21 Apr 2010 03:11:43 -0000 1.7
+++ sources 26 May 2010 13:08:35 -0000 1.8
@@ -1 +1 @@
-027a8514efcdc957eb89630884db3f5e vidalia-0.2.8.tar.gz
+8ce038ba6c3b511a4788bc3926b3390e vidalia-0.2.9.tar.gz
Index: vidalia.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/vidalia/F-13/vidalia.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vidalia.desktop 21 Apr 2010 03:11:44 -0000 1.2
+++ vidalia.desktop 26 May 2010 13:08:35 -0000 1.3
@@ -1,10 +1,9 @@
[Desktop Entry]
-Version=1.0
+Type=Application
Name=Vidalia
-GenericName=GUI controller for the Tor Onion Routing Network
-GenericName[de]=Kontrolloberfläche für das Tor Onion Routing Netzwerk
+GenericName=Tor GUI
+Comment=GUI controller for the Tor Onion Routing Network
Exec=vidalia
Terminal=false
-Type=Application
-Categories=Network;KDE;Qt;Security;
+Categories=Network;Qt;
Icon=vidalia
Index: vidalia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vidalia/F-13/vidalia.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- vidalia.spec 21 Apr 2010 03:45:52 -0000 1.11
+++ vidalia.spec 26 May 2010 13:08:35 -0000 1.12
@@ -1,5 +1,5 @@
Name: vidalia
-Version: 0.2.8
+Version: 0.2.9
Release: 1%{?dist}
Summary: GUI controller for the Tor Onion Routing Network
Group: Applications/Internet
@@ -7,13 +7,13 @@ 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)
-BuildRequires: desktop-file-utils
BuildRequires: openssl-devel
BuildRequires: qt4-devel
BuildRequires: cmake
-Requires: tor
+BuildRequires: desktop-file-utils
+Requires: tor%{?_isa}
Requires: hicolor-icon-theme
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
Obsoletes: %{name}-doc < 0.2.8-1
%description
@@ -28,11 +28,7 @@ if you wish.
%build
-%if 0%{?_qt4_bindir:1}
-PATH=%{_qt4_bindir}:$PATH; export PATH
-%else
-PATH=%{_libdir}/qt4/bin:$PATH; export PATH
-%endif
+export PATH=%{_qt4_bindir}:$PATH
# fix DSOLinking
sed -i '/torcontrol/a \ \ z' src/vidalia/CMakeLists.txt
%cmake .
@@ -41,18 +37,12 @@ make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
-
-make install \
- INSTALL="install -p" \
- DESTDIR=%{buildroot}
-
-rm -rf %{buildroot}%{_datadir}/applications/%{name}.desktop
+make install INSTALL="install -p" DESTDIR=%{buildroot}
install -Dpm0644 doc/%{name}.1 \
%{buildroot}%{_mandir}/man1/%{name}.1
-desktop-file-install --vendor="" \
+desktop-file-install --delete-original \
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE1}
@@ -87,6 +77,9 @@ rm -rf %{buildroot}
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%changelog
+* Wed May 26 2010 Chen Lei <supercyper at 163.com> - 0.2.9-1
+- New upstream release
+
* Wed Apr 21 2010 Chen Lei <supercyper at 163.com> - 0.2.8-1
- New upstream release
- Remove -doc subpackage
- Previous message: rpms/vidalia/F-12 .cvsignore, 1.6, 1.7 sources, 1.7, 1.8 vidalia.desktop, 1.2, 1.3 vidalia.spec, 1.10, 1.11
- Next message: rpms/ekiga/devel ekiga.spec,1.89,1.90
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list