rpms/frysk/devel .cvsignore, 1.6, 1.7 frysk.spec, 1.19, 1.20 sources, 1.6, 1.7
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jan 23 20:55:47 UTC 2006
Author: cagney
Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15630
Modified Files:
.cvsignore frysk.spec sources
Log Message:
* Mon Jan 23 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.22-0.FC4.0
- Simplify .spec file (remove unused macro definitions).
- Import frysk 0.0.1.2006.01.22.
- Update -files; adding frysk.desktop and fryskTrayIcon48.png.
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 22 Dec 2005 21:40:01 -0000 1.6
+++ .cvsignore 23 Jan 2006 20:55:44 -0000 1.7
@@ -1 +1 @@
-frysk-0.0.1.2005.12.14.15.12.tar.bz2
+frysk-0.0.1.2006.01.22.tar.bz2
Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- frysk.spec 22 Dec 2005 21:40:01 -0000 1.19
+++ frysk.spec 23 Jan 2006 20:55:44 -0000 1.20
@@ -1,62 +1,28 @@
-#-----------------------------------------------------------------
-
-# We're not building frysk- packages now, specify this so we don't need
-# to bother on the command line all the time.
-
-
-# install these packages into /opt if we have a prefix defined for the
-# java packages
-
-%{?java_pkg_prefix: %define _prefix /opt/frysk }
-%{?java_pkg_prefix: %define _sysconfdir %{_prefix}/etc }
-%{?java_pkg_prefix: %define _localstatedir %{_prefix}/var }
-%{?java_pkg_prefix: %define _infodir %{_prefix}/share/info }
-%{?java_pkg_prefix: %define _mandir %{_prefix}/share/man }
-%{?java_pkg_prefix: %define _defaultdocdir %{_prefix}/share/doc }
-
-%{!?c_pkg_prefix: %define c_pkg_prefix %{nil}}
-%{!?java_pkg_prefix: %define java_pkg_prefix %{nil}}
-
-# Architecture specific lib dir, lib64 on x86-64
-%define base_libdir_name lib
-
-%ifarch x86_64
-%define lib %{base_libdir_name}64
-%else
-%ifarch i386
-%define lib %{base_libdir_name}
-%endif
-%endif
-
-
-#-----------------------------------------------------------------
-
Summary: Frysk execution analysis tool
Name: frysk
-Version: 0.0.1.2005.12.14.15.12
+Version: 0.0.1.2006.01.22
Release: 0.FC4.1
-License: LGPL
+License: GPL
Group: Development/System
URL: http://sourceware.org/frysk
Source: %{name}-%{version}.tar.bz2
-Patch003: frysk-makefileam.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: %{java_pkg_prefix}libgtk-java >= 2.8.0
-Requires: %{java_pkg_prefix}libglade-java >= 2.12.0
-Requires: %{java_pkg_prefix}libvte-java >= 0.11.11
+Requires: libgtk-java >= 2.8.0
+Requires: libglade-java >= 2.12.0
+Requires: libvte-java >= 0.11.11
BuildRequires: junit >= 3.8.1
BuildRequires: antlr >= 2.7.4
BuildRequires: transfig >= 3.2.0
-BuildRequires: %{java_pkg_prefix}jdom >= 1.0
+BuildRequires: jdom >= 1.0
BuildRequires: eclipse-cdt >= 3.0.0
-BuildRequires: %{java_pkg_prefix}libgtk-java-devel >= 2.8.0
-BuildRequires: %{java_pkg_prefix}libglade-java-devel >= 2.12.0
-BuildRequires: %{java_pkg_prefix}cairo-java-devel >= 1.0.0
-BuildRequires: %{java_pkg_prefix}cairo-devel >= 1.0.0
-BuildRequires: %{java_pkg_prefix}gtk2-devel >= 2.8.0
-BuildRequires: %{java_pkg_prefix}libvte-java-devel >= 0.11.11
+BuildRequires: libgtk-java-devel >= 2.8.0
+BuildRequires: libglade-java-devel >= 2.12.0
+BuildRequires: cairo-java-devel >= 1.0.0
+BuildRequires: cairo-devel >= 1.0.0
+BuildRequires: gtk2-devel >= 2.8.0
+BuildRequires: libvte-java-devel >= 0.11.11
BuildRequires: vte-devel >= 0.11.11
# We can only build on i386 for now
@@ -73,7 +39,6 @@
%prep
%setup -q -n %{name}-%{version}
-%patch003 -p2 -b .makefileam
./autogen.sh
%build
@@ -90,23 +55,14 @@
export JAVA=${JAVA:-/usr/bin/gij}
export JV_SCAN=${JV_SCAN:-/usr/bin/jv-scan}
-
-# For now we add /opt/frysk/lib/pkgconfig to the path to indicate that
-# all the needed packages are installed there.
-if [ 'x%{java_pkg_prefix}' != 'x' ] || [ 'x%{c_pkg_prefix}' != 'x' ]; then
- export PKG_CONFIG_PATH=/opt/frysk/%{lib}/pkgconfig
-fi
-echo $PKG_CONFIG_PATH
%configure
-make
+make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
-
-make DESTDIR=$RPM_BUILD_ROOT install
-
+rm -rf %{buildroot}
+make DESTDIR=$RPM_BUILD_ROOT install %{?_smp_mflags}
%post
/sbin/ldconfig
@@ -119,15 +75,22 @@
%files
%defattr(-,root,root)
-%doc COPYING EXCEPTION
+%doc COPYING frysk-imports/common/EXCEPTION
%{_bindir}/ftrace
%{_bindir}/frysk
%{_libdir}/*so*
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%{_datadir}/java/*.jar
+%{_datadir}/applications/frysk.desktop
+%{_datadir}/pixmaps/fryskTrayIcon48.png
%changelog
+* Mon Jan 23 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.22-0.FC4.0
+- Simplify .spec file (remove unused macro definitions).
+- Import frysk 0.0.1.2006.01.22.
+- Update -files; adding frysk.desktop and fryskTrayIcon48.png.
+
* Thu Dec 22 2005 Andrew Cagney <cagney at redhat.com> 0.0.1.2005.12.14.15.12-0.FC4.1
- Import frysk-0.0.1.2005.12.14.15.12 rpm.
- Drop build dependency java-1.4.2-gcj-compat-devel
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 22 Dec 2005 21:40:01 -0000 1.6
+++ sources 23 Jan 2006 20:55:44 -0000 1.7
@@ -1 +1 @@
-058590e5430327f3e4ace6646dec5751 frysk-0.0.1.2005.12.14.15.12.tar.bz2
+958178e1427c8fdde93a891e7fc1e526 frysk-0.0.1.2006.01.22.tar.bz2
More information about the fedora-cvs-commits
mailing list