[RPM (1.5)] argouml-0.14-2jpp

David Walluck <[email protected]> Sun, 25 Jan 2004 06:03 +0100
Newsgroups gmane.linux.jpackage.announce,gmane.mail.eyebrowse.devel
Message-ID <[email protected]>
JPackage strikes again!
---------------
Name        : argouml                      Relocations: (not relocateable)
Version     : 0.14                              Vendor: JPackage Project
Release     : 2jpp                          Build Date: Sat 24 Jan 2004 10:45:05 PM CET
Install date: (not installed)               Build Host: d145h159.resnet.uconn.edu
Group       : Development                   Source RPM: (none)
Size        : 1388310                          License: BSD
Packager    : David Walluck <[email protected]>
URL         : http://argouml.tigris.org
Summary     : A UML design tool with cognitive support
Description :
The goal of the ArgoUML project is to build an object oriented design
tool that is:
- A joy to use (we really mean it),
- Actually helpful to designers when they are making design decisions,
- Completely open source Java,
- Leading edge (supports the latest UML specifications),
- Modular and extensible,
- Integrated with the web and other Tigris tools.

---------------
 Sat Jan 24 2004 David Walluck <[email protected]> 0:0.14-2jpp

- use oldgef and oldi18n-lib
- move `Obsoletes: rhmenu' to legacymenu package and add `Provides: rhmenu'
- change the way the lib dir is created


---------------
Index: argouml-script
===================================================================
RCS file: /home/cvs/jpackage/rpms/free/argouml/Attic/argouml-script,v
retrieving revision 1.1.2.4
diff -u -r1.1.2.4 argouml-script
--- argouml-script	29 Aug 2003 17:02:55 -0000	1.1.2.4
+++ argouml-script	25 Jan 2004 05:03:51 -0000
@@ -2,7 +2,7 @@
 # 
 # ArgoUML script
 # JPackage Project <http://www.jpackage.org/>
-# $Id: argouml-script,v 1.1.2.4 2003/08/29 17:02:55 jpackage Exp $
+# $Id: argouml.argouml.script,v 1.4 2002/05/06 17:44:59 guillomovitch Exp $
 
 # Source functions library
 . /usr/share/java-utils/java-functions
Index: argouml.spec
===================================================================
RCS file: /home/cvs/jpackage/rpms/free/argouml/argouml.spec,v
retrieving revision 1.11.2.4
diff -u -r1.11.2.4 argouml.spec
--- argouml.spec	29 Aug 2003 17:02:55 -0000	1.11.2.4
+++ argouml.spec	25 Jan 2004 05:03:51 -0000
@@ -3,7 +3,7 @@
 
 Name:           argouml
 Version:        0.14
-Release:        1jpp
+Release:        2jpp
 Epoch:          0
 Summary:        A UML design tool with cognitive support
 License:        BSD
@@ -19,13 +19,14 @@
 Source5:        %{name}.desktop
 Patch0:         %{name}-build.patch
 Patch1:         %{name}-properties.patch
-Requires:       antlr, dresden-ocl-argo, gef >= 0:0.9.6, log4j, nsuml
-Requires:       jpackage-utils >= 0:1.5, xml-commons-apis, i18n-lib
-BuildRequires:  ant, antlr, dresden-ocl-argo, gef >= 0:0.9.6, log4j, nsuml
-BuildRequires:  xml-commons-apis, i18n-lib, jpackage-utils >= 0:1.5
+Requires:       antlr, dresden-ocl-argo, oldgef >= 0:0.9.6, log4j, nsuml
+Requires:       jpackage-utils >= 0:1.5, xml-commons-apis
+Requires:       oldi18n-lib >= 0:0.1
+BuildRequires:  ant, antlr, dresden-ocl-argo, oldgef >= 0:0.9.6, log4j, nsuml
+BuildRequires:  xml-commons-apis, oldi18n-lib >= 0:0.1
+BuildRequires:  jpackage-utils >= 0:1.5
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Obsoletes:      %{name}-rhmenu
 
 %description
 The goal of the ArgoUML project is to build an object oriented design
@@ -50,6 +51,8 @@
 Group:          Text Editors/Integrated Development Environments (IDE)
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 Conflicts:      redhat-menus
+Obsoletes:      %{name}-rhmenu
+Provides:       %{name}-rhmenu   
 
 %description    legacymenu
 %{summary}.
@@ -77,7 +80,7 @@
 
 %build
 export CLASSPATH=$(build-classpath \
-antlr dresden-ocl-argo gef log4j nsuml xml-commons-apis i18n-lib)
+antlr dresden-ocl-argo log4j nsuml oldgef oldi18n-lib xml-commons-apis)
 ant -buildfile src_new/build.xml -Dbuild.compiler=modern jar prepare-docs
 
 
@@ -85,17 +88,20 @@
 rm -rf $RPM_BUILD_ROOT
 
 # jars
-install -D -p -m 644 build/%{name}.jar $RPM_BUILD_ROOT%{appdir}/lib/%{name}.jar
+install -d -m 755  $RPM_BUILD_ROOT%{appdir}
+install -d -m 755  $RPM_BUILD_ROOT%{appdir}/lib
+install -m 644 build/%{name}.jar $RPM_BUILD_ROOT%{appdir}/lib/%{name}.jar
 
 # scripts
-install -D -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/argouml
+install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
+install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/argouml
 
 # javadoc
-install -p -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 # mdk menu entry
-install -p -d -m 755 $RPM_BUILD_ROOT%{_menudir}
+install -d -m 755 $RPM_BUILD_ROOT%{_menudir}
 cat >$RPM_BUILD_ROOT%{_menudir}/%{name} <<EOF
 ?package(%{name}):\\
 command="%{_bindir}/%{name}"\\
@@ -107,57 +113,40 @@
 EOF
 
 # mdk icons
-install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_miconsdir}/%{name}.png 
-install -D -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_iconsdir}/%{name}.png 
-install -D -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_liconsdir}/%{name}.png
+install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_miconsdir}/%{name}.png 
+install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_iconsdir}/%{name}.png 
+install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_liconsdir}/%{name}.png
 
 # freedesktop.org menu entry
-install -D -p -m 644 %{SOURCE5} \
+install -D -m 644 %{SOURCE5} \
   $RPM_BUILD_ROOT%{_datadir}/applications/jpackage-%{name}.desktop
 
 # icons for freedesktop.org and legacy menu entries
-install -D -p -m 644 %{SOURCE2} \
+install -D -m 644 %{SOURCE2} \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -D -p -m 644 %{SOURCE3} \
+install -D -m 644 %{SOURCE3} \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -D -p -m 644 %{SOURCE4} \
+install -D -m 644 %{SOURCE4} \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-install -D -p -m 644 %{SOURCE4} \
+install -D -m 644 %{SOURCE4} \
   $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
 
 # legacy menu entry
-install -D -p -m 644 %{SOURCE4} \
+install -D -m 644 %{SOURCE4} \
   $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Development/%{name}.desktop
 
+export CLASSPATH=$(build-classpath \
+antlr dresden-ocl-argo log4j nsuml oldgef oldi18n-lib xml-commons-apis)
+pushd $RPM_BUILD_ROOT%{appdir}/lib
+for jar in $(echo $CLASSPATH | sed 's/:/ /g'); do
+ln -sf ${jar} .
+done
+popd
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-%post
-cd %{appdir}/lib \
-&& ln -sf %{_javadir}/antlr.jar \
-&& ln -sf %{_javadir}/dresden-ocl-argo.jar \
-&& ln -sf %{_javadir}/gef.jar \
-&& ln -sf %{_javadir}/log4j.jar \
-&& ln -sf %{_javadir}/nsuml.jar \
-&& ln -sf %{_javadir}/xml-commons-apis.jar \
-&& ln -sf %{_javadir}/i18n-lib.jar
- 
-%postun
-# remove links only if uninstalling
-if [ $1 -eq 0 ]; then
-  cd %{appdir}/lib \
-  && rm -f antlr.jar \
-  && rm -f dresden-ocl-argo.jar \
-  && rm -f gef.jar \
-  && rm -f log4j.jar \
-  && rm -f nsuml.jar \
-  && rm -f xml-commons-apis.jar \
-  && rm -f i18n-lib.jar
-fi
-
-
 %post mdkmenu
 %update_menus
  
@@ -175,23 +164,25 @@
 
 
 %files
-%defattr(-,root,root,-)
+%defattr(0644,root,root,0755)
 %doc src_new/README_database.sql src_new/README.txt src_new/*LICENSE.txt
-%{_bindir}/*
-%{appdir}
+%attr(0755,root,root) %{_bindir}/*
+%dir %{appdir}
+%dir %{appdir}/lib
+%{appdir}/lib/*.jar
 %{_datadir}/applications/*-%{name}.desktop
 %{_datadir}/icons/*/*/apps/*
 %{_datadir}/pixmaps/%{name}.png
 
 %files mdkmenu
-%defattr(-,root,root,-)
+%defattr(0644,root,root,0755)
 %{_menudir}/%{name}
 %{_iconsdir}/%{name}.png
 %{_miconsdir}/%{name}.png
 %{_liconsdir}/%{name}.png
 
 %files legacymenu
-%defattr(-,root,root,-)
+%defattr(0644,root,root,0755)
 %{_sysconfdir}/X11/applnk/Development/*
 
 %files javadoc
@@ -200,6 +191,11 @@
 
 
 %changelog
+* Sat Jan 24 2004 David Walluck <[email protected]> 0:0.14-2jpp
+- use oldgef and oldi18n-lib
+- move `Obsoletes: rhmenu' to legacymenu package and add `Provides: rhmenu'
+- change the way the lib dir is created
+
 * Fri Aug 29 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.14-1jpp
 - Update to 0.14.
 - More JPackage 1.5 updates.

-- 
http://www.jpackage.org/